OFBiz › OFBiz - Commits

[ofbiz-framework] branch release18.12 updated (aa4c6a8 -> d395d0f)

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

5 messages Options

mbrohl

[ofbiz-framework] branch release18.12 updated (aa4c6a8 -> d395d0f)

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a change to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.

from aa4c6a8 Improved: Enlarge the "more-app" menu in Rainbow Stome theme (OFBIZ-12181)
new 80a01d4 Fixed: Corrects wrong API use for Collections and Arrays
new f53ea72 Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171)
new 9a7d471 Fixed: Add missing dependency for the build (OFBIZ-12171)
new d395d0f Improved: Corrects the log4j-jcl version to match the other log4j libraries (OFBIZ-12171)

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

Summary of changes:
.../apache/ofbiz/content/data/DataServices.java | 3 +-
build.gradle | 40 +++++++++++++++++++---
.../ofbiz/base/container/ContainerLoader.java | 3 +-
3 files changed, 37 insertions(+), 9 deletions(-)

mbrohl

[ofbiz-framework] 01/04: Fixed: Corrects wrong API use for Collections and Arrays

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 80a01d4fbd2b2b34dd2a9d479e2110cb75d2ba4c
Author: Michael Brohl <[hidden email]>
AuthorDate: Sun Feb 14 01:03:15 2021 +0100

Fixed: Corrects wrong API use for Collections and Arrays

edu.emory.mathcs.backport.java.util.* instead of java.util.*
which was spotted during the jCenter to mavenCentral migration.
---
.../src/main/java/org/apache/ofbiz/content/data/DataServices.java | 3 +--
.../src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
index 4e8e23c..14e4113 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
@@ -28,6 +28,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -50,8 +51,6 @@ import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;

-import edu.emory.mathcs.backport.java.util.Arrays;
-
/**
* DataServices Class
*/
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
index b7a87f7..1bde29d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
@@ -20,6 +20,7 @@ package org.apache.ofbiz.base.container;

import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
@@ -32,8 +33,6 @@ import org.apache.ofbiz.base.start.StartupLoader;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilValidate;

-import edu.emory.mathcs.backport.java.util.Collections;
-
/**
* An object that loads containers (background processes).
*

mbrohl

[ofbiz-framework] 02/04: Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171)

In reply to this post by mbrohl

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit f53ea72d287c77ce94af5e8c0a1897ed0dca1b81
Author: Michael Brohl <[hidden email]>
AuthorDate: Sun Feb 14 01:04:14 2021 +0100

Improved: Switch from jCenter to mavenCentral to handle the jCenter
shutdown (OFBIZ-12171)
---
build.gradle | 39 ++++++++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 122bf1b..ea9dd40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,10 @@ import org.asciidoctor.gradle.AsciidoctorTask
* ======================================================== */
buildscript {
repositories {
- jcenter()
+ mavenCentral()
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
}
dependencies {
classpath 'at.bxm.gradleplugins:gradle-svntools-plugin:2.2.1'
@@ -106,8 +109,34 @@ defaultTasks 'build'

allprojects {
repositories{
- jcenter()
- mavenLocal()
+ mavenCentral()
+ // the switch from jCenter to mavenCentral needs some additional repositories to be configured here
+ // this should be checked frequently to remove obsolete configurations if the artifacts are available
+ // on mavenCentral directly
+ maven {
+ // org.restlet and org.restlet.ext.servlet
+ url "https://maven.restlet.talend.com"
+ }
+ maven {
+ // apache-xerces:xercesImpl:2.9.1
+ url "https://maven.repository.redhat.com/ga/"
+ }
+ maven {
+ // net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12
+ url "https://packages.atlassian.com/maven-3rdparty"
+ }
+ maven {
+ // org/milyn/flute/1.3/flute-1.3.jar
+ // need artifact only because of wrong pom metadata in maven central
+ url "https://repo1.maven.org/maven2"
+ metadataSources {
+ artifact()
+ }
+ }
+ maven {
+ // com.springsource.com.sun.syndication
+ url "https://repo.spring.io/plugins-release"
+ }
}
}

@@ -143,7 +172,7 @@ dependencies {
compile 'com.ibm.icu:icu4j:63.1'
compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455
compile 'com.sun.mail:javax.mail:1.6.2'
- compile 'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0'
+ compile 'com.sun.syndication:com.springsource.com.sun.syndication:1.0.0'
compile 'com.thoughtworks.xstream:xstream:1.4.11.1'
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
@@ -154,7 +183,7 @@ dependencies {
compile 'javax.servlet:javax.servlet-api:4.0.1'
compile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
compile 'junit:junit-dep:4.11'
- compile 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
+ compile 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
compile 'org.apache.ant:ant-junit:1.10.5'
compile 'org.apache.axis2:axis2-kernel:1.7.8'
compile 'org.apache.commons:commons-collections4:4.2'

mbrohl

[ofbiz-framework] 03/04: Fixed: Add missing dependency for the build (OFBIZ-12171)

In reply to this post by mbrohl

mbrohl

[ofbiz-framework] 04/04: Improved: Corrects the log4j-jcl version to match the other log4j libraries (OFBIZ-12171)

In reply to this post by mbrohl