[ofbiz-framework] branch trunk updated (d60bf15 -> 8ea75c9)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated (d60bf15 -> 8ea75c9)

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

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


    from d60bf15  Fixed: Remove _PREVIOUS_REQUEST_ Session Attribute on non-authentication pages (OFBIZ-12047)
     new 2b118ce  Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171)
     new 8ea75c9  Fixed: Adds log4j dependencies to avoid classpath conflict while loading log4j ReflectionUtil (OFBIZ-12171)

The 2 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:
 build.gradle | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

Reply | Threaded
Open this post in threaded view
|

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

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

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

commit 2b118ce6432c377b89a7cf2a5f4fed7e71a07ec2
Author: Michael Brohl <[hidden email]>
AuthorDate: Wed Feb 10 00:55:34 2021 +0100

    Improved: Switch from jCenter to mavenCentral to handle the jCenter
    shutdown (OFBIZ-12171)
   
    See comments in build.gradle for details.
---
 build.gradle | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index f40f89a..0963962 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,8 +128,31 @@ defaultTasks 'jar', 'test'
 
 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 {
+            // net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11
+            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"
+        }
+
     }
 }
 
@@ -170,7 +193,7 @@ dependencies {
     implementation 'commons-net:commons-net:3.7.2'
     implementation 'commons-validator:commons-validator:1.7'
     implementation 'de.odysseus.juel:juel-impl:2.2.7'
-    implementation 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
+    implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
     implementation 'net.lingala.zip4j:zip4j:2.6.4'
     implementation 'org.apache.ant:ant-junit:1.10.9'
     implementation 'org.apache.commons:commons-collections4:4.4'

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 02/02: Fixed: Adds log4j dependencies to avoid classpath conflict while loading log4j ReflectionUtil (OFBIZ-12171)

mbrohl
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 trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 8ea75c9e2e218f350980ff104df9cdd4e2d1ad4e
Author: Michael Brohl <[hidden email]>
AuthorDate: Fri Feb 12 22:55:19 2021 +0100

    Fixed: Adds log4j dependencies to avoid classpath conflict while loading
    log4j ReflectionUtil (OFBIZ-12171)
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0963962..4f641af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -241,9 +241,9 @@ dependencies {
     runtimeOnly 'org.apache.derby:derby:10.14.2.0'  // So far we did not update from 10.14.2.0 because of a compile issue. You may try w/ a newer version than 10.15.1.3
     runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
     runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.14.0' // for external jars using the old log4j1.2: routes logging to log4j 2
-    runtimeOnly 'org.apache.logging.log4j:log4j-core:2.14.0' // the implementation of the log4j 2 API
     runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.14.0' // for external jars using the java.util.logging: routes logging to log4j 2
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.0' // for external jars using slf4j: routes logging to log4j 2
+    runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.14.0' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
     runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
 
     // Dependencies defined by the plugins