From 15dcdb6a8d6e9ce2b614048ff18b24dc0a20e37a6de0423233fd162d68e1c783 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 20:40:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=40 --- 0001-Adapt-mvn-script.patch | 28 +- 0002-Invoke-logback-via-reflection.patch | 6 +- 0004-Remove-dependency-on-powermock.patch | 96 ------ ...ch => 0004-Use-non-shaded-HTTP-wagon.patch | 16 +- 0005-Port-to-maven-resolver-1.7.2.patch | 50 +-- ...odelValidator-compatibility-with-Mav.patch | 37 --- apache-maven-3.8.4-build.tar.xz | 3 + apache-maven-3.8.4-src.tar.gz | 3 + apache-maven-3.8.4-src.tar.gz.asc | 11 + apache-maven-3.8.5-build.tar.xz | 3 - apache-maven-3.8.5-src.tar.gz | 3 - apache-maven-3.8.5-src.tar.gz.asc | 11 - maven.keyring | 302 +++++++----------- maven.spec | 28 +- qdox-2.0.1.patch | 120 +++++++ 15 files changed, 321 insertions(+), 396 deletions(-) delete mode 100644 0004-Remove-dependency-on-powermock.patch rename 0003-Use-non-shaded-HTTP-wagon.patch => 0004-Use-non-shaded-HTTP-wagon.patch (80%) delete mode 100644 0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch create mode 100644 apache-maven-3.8.4-build.tar.xz create mode 100644 apache-maven-3.8.4-src.tar.gz create mode 100644 apache-maven-3.8.4-src.tar.gz.asc delete mode 100644 apache-maven-3.8.5-build.tar.xz delete mode 100644 apache-maven-3.8.5-src.tar.gz delete mode 100644 apache-maven-3.8.5-src.tar.gz.asc create mode 100644 qdox-2.0.1.patch diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index 7dd865d..d531bed 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From bf34ee0a7363af06a70974c5b5334b5531f2c648 Mon Sep 17 00:00:00 2001 +From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/6] Adapt mvn script +Subject: [PATCH 1/3] Adapt mvn script --- - apache-maven/src/bin/mvn | 13 +++++++++-- - 1 file changed, 10 insertions(+), 3 deletions(-) + apache-maven/src/bin/mvn | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index dfa384b8e..605c0edd3 100755 +index a554c66..818cf70 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -20,11 +20,11 @@ index dfa384b8e..605c0edd3 100755 # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. # ----------------------------------------------------------------------------- -@@ -37,12 +37,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then +@@ -37,12 +37,24 @@ . /etc/mavenrc fi -+ if [ -z "$JAVA_HOME" ] ; then ++ if [ -f /etc/java/maven.conf ] ; then + . /etc/java/maven.conf + fi + @@ -34,12 +34,18 @@ index dfa384b8e..605c0edd3 100755 fi ++if [ -f /usr/share/java-utils/java-functions ] ; then ++ . /usr/share/java-utils/java-functions ++ set_jvm ++ set_javacmd ++fi +export JAVA_HOME ++export JAVACMD + # OS specific support. $var _must_ be set to either true or false. cygwin=false; mingw=false; -@@ -67,7 +73,8 @@ done +@@ -67,7 +79,8 @@ saveddir=`pwd` @@ -49,15 +55,15 @@ index dfa384b8e..605c0edd3 100755 # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -105,7 +112,7 @@ +@@ -105,7 +118,7 @@ exit 1 fi -CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar` -+CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds.jar` ++CLASSWORLDS_JAR=`build-classpath plexus-classworlds` CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher # For Cygwin, switch paths to Windows format before running java -- -2.36.0 +2.17.1 diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch index 4a45be3..2843df5 100644 --- a/0002-Invoke-logback-via-reflection.patch +++ b/0002-Invoke-logback-via-reflection.patch @@ -1,7 +1,7 @@ -From 6df635d9ba9e5e0354f01c158b9410783bbeec53 Mon Sep 17 00:00:00 2001 +From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/6] Invoke logback via reflection +Subject: [PATCH 2/4] Invoke logback via reflection --- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- @@ -49,5 +49,5 @@ index 5d9fab744..ced38cb5a 100644 @Override -- -2.36.0 +2.21.0 diff --git a/0004-Remove-dependency-on-powermock.patch b/0004-Remove-dependency-on-powermock.patch deleted file mode 100644 index 1e1ccd4..0000000 --- a/0004-Remove-dependency-on-powermock.patch +++ /dev/null @@ -1,96 +0,0 @@ -From a8fc2a43c376db91aebd631acdeeef88673df0d1 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 5 Sep 2019 15:21:04 +0200 -Subject: [PATCH 4/6] Remove dependency on powermock - ---- - .../StringSearchModelInterpolatorTest.java | 66 ------------------- - 1 file changed, 66 deletions(-) - -diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java -index c95e37271..aafafa52f 100644 ---- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java -+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java -@@ -36,8 +36,6 @@ - import static org.hamcrest.CoreMatchers.anyOf; - import static org.hamcrest.CoreMatchers.is; - import static org.junit.Assert.assertThat; --import static org.powermock.reflect.Whitebox.getField; --import static org.powermock.reflect.Whitebox.getInternalState; - - /** - * @author jdcasey -@@ -375,70 +373,6 @@ public void testInterpolateObjectWithPomFile() - ) ) ); - } - -- public void testNotInterpolateObjectWithFile() -- throws Exception -- { -- Model model = new Model(); -- -- File baseDir = new File( System.getProperty( "user.dir" ) ); -- -- Properties p = new Properties(); -- -- ObjectWithNotInterpolatedFile obj = new ObjectWithNotInterpolatedFile( baseDir ); -- -- StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator(); -- -- ModelBuildingRequest config = createModelBuildingRequest( p ); -- -- SimpleProblemCollector collector = new SimpleProblemCollector(); -- interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); -- assertProblemFree( collector ); -- -- //noinspection unchecked -- Map, ?> cache = -- (Map, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" ) -- .get( null ); -- -- Object objCacheItem = cache.get( Object.class ); -- Object fileCacheItem = cache.get( File.class ); -- -- assertNotNull( objCacheItem ); -- assertNotNull( fileCacheItem ); -- -- assertThat( ( (Object[]) getInternalState( objCacheItem, "fields" ) ).length, is( 0 ) ); -- assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) ); -- } -- -- public void testNotInterpolateFile() -- throws Exception -- { -- Model model = new Model(); -- -- File baseDir = new File( System.getProperty( "user.dir" ) ); -- -- Properties p = new Properties(); -- -- StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator(); -- -- ModelBuildingRequest config = createModelBuildingRequest( p ); -- -- SimpleProblemCollector collector = new SimpleProblemCollector(); -- interpolator.interpolateObject( baseDir, model, new File( "." ), config, collector ); -- assertProblemFree( collector ); -- -- //noinspection unchecked -- Map, ?> cache = -- (Map, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" ) -- .get( null ); -- -- Object fileCacheItem = cache.get( File.class ); -- -- assertNotNull( fileCacheItem ); -- -- assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) ); -- } -- -- - public void testConcurrentInterpolation() - throws Exception - { --- -2.36.0 - diff --git a/0003-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch similarity index 80% rename from 0003-Use-non-shaded-HTTP-wagon.patch rename to 0004-Use-non-shaded-HTTP-wagon.patch index 85cfd9e..58c0c6e 100644 --- a/0003-Use-non-shaded-HTTP-wagon.patch +++ b/0004-Use-non-shaded-HTTP-wagon.patch @@ -1,7 +1,7 @@ -From af685ec847255712ce328677162573451101e0e3 Mon Sep 17 00:00:00 2001 +From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 09:51:56 +0200 -Subject: [PATCH 3/6] Use non-shaded HTTP wagon +Subject: [PATCH 4/4] Use non-shaded HTTP wagon --- apache-maven/pom.xml | 15 --------------- @@ -9,7 +9,7 @@ Subject: [PATCH 3/6] Use non-shaded HTTP wagon 2 files changed, 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 7ff412767..b15091576 100644 +index 2686570af..d22ae121d 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -63,21 +63,6 @@ under the License. @@ -32,13 +32,13 @@ index 7ff412767..b15091576 100644 - - - - org.slf4j +