OFBiz › OFBiz - Commits

[ofbiz-framework] branch release17.12 updated (392f18f -> ec4bff7)

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

4 messages Options

mbrohl

[ofbiz-framework] branch release17.12 updated (392f18f -> ec4bff7)

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

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

from 392f18f Improved: Enlarge the "more-app" menu in Rainbow Stome theme (OFBIZ-12181)
new 2b8f4f8 Fixed: Corrects wrong API use for Collections and Arrays
new d6c6330 Improved: Upgrades Gradle due to the jCenter to mavenCentral migration (OFBIZ-12171)
new ec4bff7 Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171)

The 3 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 | 2 +-
.../ofbiz/securityext/login/LoginEvents.java | 3 +-
build.gradle | 43 +++++++++++++++++++---
.../ofbiz/base/container/ContainerLoader.java | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 42 insertions(+), 10 deletions(-)

mbrohl

[ofbiz-framework] 01/03: 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 release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 2b8f4f8b64a7d82d5ac4ae3d5f3a144982a8876d
Author: Michael Brohl <[hidden email]>
AuthorDate: Thu Feb 18 21:56:00 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 | 2 +-
.../src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java | 3 +--
.../src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java | 2 +-
3 files changed, 3 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..2b30528 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,7 +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/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
index 3565826..86b448e 100644
--- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
+++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
@@ -21,6 +21,7 @@ package org.apache.ofbiz.securityext.login;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
@@ -58,8 +59,6 @@ import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.webapp.control.LoginWorker;

-import edu.emory.mathcs.backport.java.util.Arrays;
-
/**
* LoginEvents - Events for UserLogin and Security handling.
*/
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 619c52c..8a3e594 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,7 +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/03: Improved: Upgrades Gradle due to the jCenter to mavenCentral migration (OFBIZ-12171)

In reply to this post by mbrohl

mbrohl

[ofbiz-framework] 03/03: 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 release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ec4bff76a0dabf8f3be44606d3707c79b2fc5a8d
Author: Michael Brohl <[hidden email]>
AuthorDate: Thu Feb 18 21:58:42 2021 +0100

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

diff --git a/build.gradle b/build.gradle
index e301d16..a0c915a 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'
@@ -79,8 +82,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"
+ }
}
}

@@ -116,7 +145,7 @@ dependencies {
compile 'com.ibm.icu:icu4j:60.2'
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.0'
- 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.10'
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
@@ -127,12 +156,15 @@ dependencies {
compile 'javax.servlet:javax.servlet-api:4.0.0'
compile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02'
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.1'
compile 'org.apache.axis2:axis2-kernel:1.7.7'
compile 'org.apache.commons:commons-collections4:4.1'
compile 'org.apache.commons:commons-csv:1.5'
compile 'org.apache.commons:commons-dbcp2:2.1.1'
+ compile ('commons-io:commons-io:2.5') {
+ force = true
+ }
compile 'org.apache.commons:commons-text:1.6'
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
@@ -177,6 +209,7 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core:2.10.0' // the implementation of the log4j 2 API
runtime 'org.apache.logging.log4j:log4j-jul:2.10.0' // for external jars using the java.util.logging: routes logging to log4j 2
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' // for external jars using slf4j: routes logging to log4j 2
+ runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'

// plugin libs