pool/maven
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting because the 3.9.1 will need more work

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=61
This commit is contained in:
Fridrich Strba 2023-05-02 10:08:32 +00:00 committed by Git OBS Bridge
parent c0a6e02f71
commit 94b68eedb2
13 changed files with 454 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Adapt-mvn-script.patch
View File

@ -1,14 +1,14 @@
From abda3bfec41730810ee98e685b128f27ddc24c36 Mon Sep 17 00:00:00 2001 From 6e8f6a1b27c09d0a84fb5f3b7269cf5840db04f8 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com> From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 1 Feb 2017 14:54:26 +0100 Date: Wed, 1 Feb 2017 14:54:26 +0100
Subject: [PATCH 1/3] Adapt mvn script Subject: [PATCH 1/7] Adapt mvn script
--- ---
apache-maven/src/bin/mvn | 15 +++++++++------ apache-maven/src/bin/mvn | 19 ++++++++++++++++---
1 file changed, 9 insertions(+), 6 deletions(-) 1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index a3004f917..9b118717e 100755 index dfa384b8e..8c03825ed 100755
--- a/apache-maven/src/bin/mvn --- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
@ -17,22 +17,14 @@ index a3004f917..9b118717e 100755
# #
-# JAVA_HOME Must point at your Java Development Kit installation. -# JAVA_HOME Must point at your Java Development Kit installation.
+# JAVA_HOME (Optional) Must point at your Java Development Kit installation. +# JAVA_HOME (Optional) Must point at your Java Development Kit installation.
# MAVEN_ARGS (Optional) Arguments passed to Maven before CLI arguments.
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
@@ -30,20 +30,22 @@ # -----------------------------------------------------------------------------
@@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
if [ -z "$MAVEN_SKIP_RC" ] ; then
- if [ -f /usr/local/etc/mavenrc ] ; then
- . /usr/local/etc/mavenrc
- fi
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc . /etc/mavenrc
fi fi
+ if [ -z "$JAVA_HOME" ] ; then + if [ -f /etc/java/maven.conf ] ; then
+ . /etc/java/maven.conf + . /etc/java/maven.conf
+ fi + fi
+ +
@ -42,12 +34,18 @@ index a3004f917..9b118717e 100755
fi 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 JAVA_HOME
+export JAVACMD
+ +
# OS specific support. $var _must_ be set to either true or false. # OS specific support. $var _must_ be set to either true or false.
cygwin=false; cygwin=false;
mingw=false; mingw=false;
@@ -68,7 +70,8 @@ done @@ -67,7 +79,8 @@ done
saveddir=`pwd` saveddir=`pwd`
@ -57,7 +55,7 @@ index a3004f917..9b118717e 100755
# make it fully qualified # make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
@@ -106,7 +109,7 @@ @@ -105,7 +118,7 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1 exit 1
fi fi
@ -67,5 +65,5 @@ index a3004f917..9b118717e 100755
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
-- --
2.39.2 2.36.1

84
0002-Invoke-logback-via-reflection.patch
View File

@ -1,51 +1,53 @@
From a59ddba0d41b0ba1ea9c8c6ac541a71d737cdf30 Mon Sep 17 00:00:00 2001 From 4d259917ec0a1e73a9bbf23e0737acd64727b802 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com> From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 6 Jun 2017 13:47:43 +0200 Date: Tue, 6 Jun 2017 13:47:43 +0200
Subject: [PATCH 2/3] Invoke logback via reflection Subject: [PATCH 2/7] Invoke logback via reflection
--- ---
.../cli/logging/impl/LogbackConfiguration.java | 18 +++++++++++++----- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-) 1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
index 4dc5a37b8..a977ba085 100644 index 5d9fab744..ced38cb5a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -31,21 +31,29 @@ @@ -35,22 +35,31 @@
public class LogbackConfiguration extends BaseSlf4jConfiguration { @Override
@Override public void setRootLoggerLevel( Level level )
public void setRootLoggerLevel(Level level) { {
- ch.qos.logback.classic.Level value; - ch.qos.logback.classic.Level value;
+ String value; + String value;
switch (level) { switch ( level )
case DEBUG: {
- value = ch.qos.logback.classic.Level.DEBUG; case DEBUG:
+ value = "DEBUG"; - value = ch.qos.logback.classic.Level.DEBUG;
break; + value = "DEBUG";
break;
case INFO:
- value = ch.qos.logback.classic.Level.INFO; case INFO:
+ value = "INFO"; - value = ch.qos.logback.classic.Level.INFO;
break; + value = "INFO";
break;
default:
- value = ch.qos.logback.classic.Level.ERROR; default:
+ value = "ERROR"; - value = ch.qos.logback.classic.Level.ERROR;
break; + value = "ERROR";
} break;
- ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)).setLevel(value); }
+ Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
+ try { + Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
+ Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level"); + try {
+ Object logbackLevel = levelClass.getField(value).get(null); + Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level");
+ Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger"); + Object logbackLevel = levelClass.getField(value).get(null);
+ loggerClass.getMethod("setLevel", new Class<?>[] {levelClass}).invoke(logger, new Object[] {logbackLevel}); + Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger");
+ } catch (Exception e) { + loggerClass.getMethod("setLevel", new Class<?>[] {levelClass})
+ throw new RuntimeException("Failed to initialize logback configuration", e); + .invoke(logger, new Object[] {logbackLevel});
+ } + } catch (Exception e) {
} + throw new RuntimeException("Failed to initialize logback configuration", e);
+ }
@Override }
@Override
-- --
2.39.2 2.36.1

89
0003-Remove-dependency-on-powermock.patch
View File

@ -1,89 +0,0 @@
From ad1e669b96a5d251c36384e89d535b9c712a6246 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 5 Sep 2019 15:21:04 +0200
Subject: [PATCH 3/3] Remove dependency on powermock
---
.../StringSearchModelInterpolatorTest.java | 59 -------------------
1 file changed, 59 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 b2612e540..20b7162e2 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
@@ -35,8 +35,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
@@ -344,63 +342,6 @@ public void testInterpolateObjectWithPomFile() throws Exception {
is(System.getProperty("user.dir") + File.separator + '.' + File.separator + "target"))));
}
- 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<Class<?>, ?> cache = (Map<Class<?>, ?>)
- 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<Class<?>, ?> cache = (Map<Class<?>, ?>)
- 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 {
final Model model = new Model();
--
2.39.2

51
0003-Use-non-shaded-HTTP-wagon.patch Normal file
View File

@ -0,0 +1,51 @@
From 507d1090563596d0752918ec3572a8c4a4130d2b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 1 Jul 2019 09:51:56 +0200
Subject: [PATCH 3/7] Use non-shaded HTTP wagon
---
apache-maven/pom.xml | 15 ---------------
pom.xml | 1 -
2 files changed, 16 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7ff412767..b15091576 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
- <classifier>shaded</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pom.xml b/pom.xml
index c319cae26..42afab5f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,6 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version>
- <classifier>shaded</classifier>
</dependency>
<!-- Repository -->
<dependency>
--
2.36.1

96
0004-Remove-dependency-on-powermock.patch Normal file
View File

@ -0,0 +1,96 @@
From 710c46095ed8b34c0cb7c2e69379db044eb026e9 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 5 Sep 2019 15:21:04 +0200
Subject: [PATCH 4/7] 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<Class<?>, ?> cache =
- (Map<Class<?>, ?>) 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<Class<?>, ?> cache =
- (Map<Class<?>, ?>) 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.1

25
0005-Port-to-maven-resolver-1.7.2.patch Normal file
View File

@ -0,0 +1,25 @@
From 64c73b39d35ac08666cb1f1eb0be26150bf4a821 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 17 Dec 2021 13:05:49 +0100
Subject: [PATCH 5/7] Port to maven-resolver 1.7.2
---
.../org/apache/maven/repository/internal/MavenAetherModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
index 41e98aaea..d72e3c0f3 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
@@ -28,7 +28,7 @@
import org.apache.maven.model.building.DefaultModelBuilderFactory;
import org.apache.maven.model.building.ModelBuilder;
-import org.eclipse.aether.impl.AetherModule;
+import org.eclipse.aether.impl.guice.AetherModule;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
--
2.36.1

37
0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch Normal file
View File

@ -0,0 +1,37 @@
From 8b9a2cb2879012dfa2e666a6c33be183da532d47 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 22 Apr 2022 11:15:38 +0200
Subject: [PATCH 6/7] Restore DefaultModelValidator compatibility with Maven
3.5.4
---
.../maven/model/validation/DefaultModelValidator.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index f77321c16..4ed22f3ed 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -44,6 +44,7 @@
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.interpolation.DefaultModelVersionProcessor;
import org.apache.maven.model.interpolation.ModelVersionProcessor;
import org.codehaus.plexus.util.StringUtils;
@@ -85,6 +86,11 @@
private ModelVersionProcessor versionProcessor;
+ public DefaultModelValidator()
+ {
+ this( new DefaultModelVersionProcessor() );
+ }
+
@Inject
public DefaultModelValidator( ModelVersionProcessor versionProcessor )
{
--
2.36.1

158
0007-Fix-build-with-qdox-2.0.1.patch Normal file
View File

@ -0,0 +1,158 @@
From c8ecbea0dd63d065376768e8cae571a15aa48ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Fri, 13 May 2022 17:34:20 +0200
Subject: [PATCH 7/7] Fix build with qdox-2.0.1
---
.../org/apache/maven/plugin/DefaultExtensionRealmCache.java | 2 +-
.../org/apache/maven/plugin/DefaultPluginArtifactsCache.java | 2 +-
.../java/org/apache/maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../java/org/apache/maven/plugin/ExtensionRealmCache.java | 4 ++--
.../java/org/apache/maven/plugin/PluginArtifactsCache.java | 4 ++--
.../main/java/org/apache/maven/plugin/PluginRealmCache.java | 4 ++--
.../org/apache/maven/project/DefaultProjectRealmCache.java | 2 +-
.../main/java/org/apache/maven/project/ProjectRealmCache.java | 2 +-
.../maven/project/artifact/DefaultProjectArtifactsCache.java | 2 +-
.../apache/maven/project/artifact/ProjectArtifactsCache.java | 4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
index 6ce63ebbf..e3241c070 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
@@ -157,7 +157,7 @@ public void flush()
cache.clear();
}
- public void register( MavenProject project, Key key, CacheRecord record )
+ public void register( MavenProject project, Key key, CacheRecord record_ )
{
// default cache does not track extension usage
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
index ee11c4c89..2adb29369 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
@@ -198,7 +198,7 @@ protected static boolean pluginEquals( Plugin a, Plugin b )
return CacheUtils.pluginEquals( a, b );
}
- public void register( MavenProject project, Key cacheKey, CacheRecord record )
+ public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
{
// default cache does not track record usage
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
index 7862b40de..9432d307f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -200,7 +200,7 @@ protected static boolean pluginEquals( Plugin a, Plugin b )
return CacheUtils.pluginEquals( a, b );
}
- public void register( MavenProject project, Key key, CacheRecord record )
+ public void register( MavenProject project, Key key, CacheRecord record_ )
{
// default cache does not track plugin usage
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
index 4d01aca4f..c0fda73c6 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
@@ -94,8 +94,8 @@ CacheRecord put( Key key, ClassRealm extensionRealm, ExtensionDescriptor extensi
* cache.
*
* @param project The project that employs the plugin realm, must not be {@code null}.
- * @param record The cache record being used for the project, must not be {@code null}.
+ * @param record_ The cache record being used for the project, must not be {@code null}.
*/
- void register( MavenProject project, Key key, CacheRecord record );
+ void register( MavenProject project, Key key, CacheRecord record_ );
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
index 11f5d701f..cf17fe3d8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
@@ -97,8 +97,8 @@ Key createKey( Plugin plugin, DependencyFilter extensionFilter, List<RemoteRepos
* cache.
*
* @param project The project that employs the plugin realm, must not be {@code null}.
- * @param record The cache record being used for the project, must not be {@code null}.
+ * @param record_ The cache record being used for the project, must not be {@code null}.
*/
- void register( MavenProject project, Key cacheKey, CacheRecord record );
+ void register( MavenProject project, Key cacheKey, CacheRecord record_ );
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
index 78c3ae6f3..f4aa66f78 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -90,8 +90,8 @@ Key createKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader>
* cache.
*
* @param project The project that employs the plugin realm, must not be {@code null}.
- * @param record The cache record being used for the project, must not be {@code null}.
+ * @param record_ The cache record being used for the project, must not be {@code null}.
*/
- void register( MavenProject project, Key key, CacheRecord record );
+ void register( MavenProject project, Key key, CacheRecord record_ );
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
index a7f06156a..c74fd644f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
@@ -135,7 +135,7 @@ public void flush()
cache.clear();
}
- public void register( MavenProject project, Key key, CacheRecord record )
+ public void register( MavenProject project, Key key, CacheRecord record_ )
{
// default cache does not track record usage
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
index 28ac0d620..72d4002c6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
@@ -87,6 +87,6 @@ public DependencyFilter getExtensionArtifactFilter()
* @param project The project that employs the plugin realm, must not be {@code null}.
* @param record The cache record being used for the project, must not be {@code null}.
*/
- void register( MavenProject project, Key key, CacheRecord record );
+ void register( MavenProject project, Key key, CacheRecord record_ );
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
index ae59ada4d..83b1b4333 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
@@ -240,7 +240,7 @@ public void flush()
}
@Override
- public void register( MavenProject project, Key cacheKey, CacheRecord record )
+ public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
{
// default cache does not track record usage
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
index 8d8ad790e..690392da5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
@@ -96,8 +96,8 @@ Key createKey( MavenProject project, Collection<String> scopesToCollect, Collect
* cache.
*
* @param project The project that employs the plugin realm, must not be {@code null}.
- * @param record The cache record being used for the project, must not be {@code null}.
+ * @param record_ The cache record being used for the project, must not be {@code null}.
*/
- void register( MavenProject project, Key cacheKey, CacheRecord record );
+ void register( MavenProject project, Key cacheKey, CacheRecord record_ );
}
--
2.36.1

3
apache-maven-3.8.8-build.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8dc3e33eb9a433865f9923dbcc294a5429731f4687126492f8b09ffe559246dc
size 5176

3
apache-maven-3.8.8-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:224dbca28737d0b63a257f0a07c8ffae333a13cab837120dd15e773a357a0207
size 2792384

3
apache-maven-3.9.1-build.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69b7c0318e2191f7c819be2bb69cdd041f337ed6cbee62d5d2e7582eea5e23ba
size 5232

3
apache-maven-3.9.1-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83276c67dfa8084a1f6369fae4ec6fd6b47b31138a970f6f1819c7ad5e250b55
size 2784624

32
maven.spec
View File

@ -20,7 +20,7 @@
%global homedir %{_datadir}/%{name}%{?maven_version_suffix} %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
Name: maven Name: maven
Version: 3.9.1 Version: 3.8.8
Release: 0 Release: 0
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0 # maven itself is ASL 2.0
@ -35,13 +35,19 @@ Source10: apache-%{name}-%{version}-build.tar.xz
Patch1: 0001-Adapt-mvn-script.patch Patch1: 0001-Adapt-mvn-script.patch
# Downstream-specific, avoids dependency on logback # Downstream-specific, avoids dependency on logback
Patch2: 0002-Invoke-logback-via-reflection.patch Patch2: 0002-Invoke-logback-via-reflection.patch
Patch3: 0003-Remove-dependency-on-powermock.patch Patch3: 0003-Use-non-shaded-HTTP-wagon.patch
Patch4: 0004-Remove-dependency-on-powermock.patch
Patch5: 0005-Port-to-maven-resolver-1.7.2.patch
Patch6: 0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
Patch7: 0007-Fix-build-with-qdox-2.0.1.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-logging BuildRequires: apache-commons-logging
BuildRequires: atinject BuildRequires: atinject
BuildRequires: cdi-api
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: glassfish-annotation-api BuildRequires: glassfish-annotation-api
@ -51,6 +57,7 @@ BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core BuildRequires: httpcomponents-core
BuildRequires: jansi BuildRequires: jansi
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jboss-interceptors-1.2-api
BuildRequires: jcl-over-slf4j BuildRequires: jcl-over-slf4j
BuildRequires: jdom2 BuildRequires: jdom2
BuildRequires: maven-resolver-api BuildRequires: maven-resolver-api
@ -58,8 +65,6 @@ BuildRequires: maven-resolver-connector-basic
BuildRequires: maven-resolver-impl BuildRequires: maven-resolver-impl
BuildRequires: maven-resolver-named-locks BuildRequires: maven-resolver-named-locks
BuildRequires: maven-resolver-spi BuildRequires: maven-resolver-spi
BuildRequires: maven-resolver-transport-file
BuildRequires: maven-resolver-transport-http
BuildRequires: maven-resolver-transport-wagon BuildRequires: maven-resolver-transport-wagon
BuildRequires: maven-resolver-util BuildRequires: maven-resolver-util
BuildRequires: maven-shared-utils BuildRequires: maven-shared-utils
@ -112,6 +117,7 @@ Summary: Core part of Maven
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: apache-commons-cli Requires: apache-commons-cli
Requires: apache-commons-codec Requires: apache-commons-codec
Requires: apache-commons-io
Requires: apache-commons-lang3 Requires: apache-commons-lang3
Requires: apache-commons-logging Requires: apache-commons-logging
Requires: atinject Requires: atinject
@ -122,6 +128,7 @@ Requires: httpcomponents-client
Requires: httpcomponents-core Requires: httpcomponents-core
Requires: jansi Requires: jansi
Requires: javapackages-tools Requires: javapackages-tools
Requires: jboss-interceptors-1.2-api
Requires: jcl-over-slf4j Requires: jcl-over-slf4j
Requires: junit Requires: junit
Requires: maven-resolver-api Requires: maven-resolver-api
@ -129,8 +136,6 @@ Requires: maven-resolver-connector-basic
Requires: maven-resolver-impl Requires: maven-resolver-impl
Requires: maven-resolver-named-locks Requires: maven-resolver-named-locks
Requires: maven-resolver-spi Requires: maven-resolver-spi
Requires: maven-resolver-transport-file
Requires: maven-resolver-transport-http
Requires: maven-resolver-transport-wagon Requires: maven-resolver-transport-wagon
Requires: maven-resolver-util Requires: maven-resolver-util
Requires: maven-shared-utils Requires: maven-shared-utils
@ -178,6 +183,10 @@ BuildArch: noarch
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# not really used during build, but a precaution # not really used during build, but a precaution
find -name '*.jar' -not -path '*/test/*' -delete find -name '*.jar' -not -path '*/test/*' -delete
@ -210,8 +219,6 @@ sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build
%pom_remove_dep -r :logback-classic %pom_remove_dep -r :logback-classic
%pom_xpath_remove pom:parent/pom:relativePath
%{mvn_alias} :maven-resolver-provider :maven-aether-provider %{mvn_alias} :maven-resolver-provider :maven-aether-provider
%build %build
@ -220,9 +227,10 @@ build-jar-repository -s lib \
apache-commons-lang3 \ apache-commons-lang3 \
atinject \ atinject \
commons-cli \ commons-cli \
glassfish-annotation-api \ commons-io \
guava/guava \ guava/guava \
guice/google-guice-no_aop \ guice/google-guice-no_aop \
jboss-interceptors-1.2-api \
jdom2/jdom2 \ jdom2/jdom2 \
maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-impl \
@ -287,14 +295,18 @@ chmod -x %{buildroot}%{homedir}/bin/*.cmd %{buildroot}%{homedir}/bin/*.conf
# Transitive deps of wagon-http, missing because of unshading # Transitive deps of wagon-http, missing because of unshading
build-jar-repository -p %{buildroot}%{homedir}/lib \ build-jar-repository -p %{buildroot}%{homedir}/lib \
cdi-api/cdi-api \
commons-cli \ commons-cli \
commons-codec \ commons-codec \
commons-io \
apache-commons-lang3 \ apache-commons-lang3 \
guava/guava \ guava/guava \
guice/google-guice-no_aop \ guice/google-guice-no_aop \
httpcomponents/httpclient \ httpcomponents/httpclient \
httpcomponents/httpcore \ httpcomponents/httpcore \
jansi/jansi \ jansi/jansi \
jboss-interceptors-1.2-api \
jsoup/jsoup \
atinject \ atinject \
slf4j/jcl-over-slf4j \ slf4j/jcl-over-slf4j \
glassfish-annotation-api \ glassfish-annotation-api \
@ -303,8 +315,6 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-impl \
maven-resolver/maven-resolver-named-locks \ maven-resolver/maven-resolver-named-locks \
maven-resolver/maven-resolver-spi \ maven-resolver/maven-resolver-spi \
maven-resolver/maven-resolver-transport-file \
maven-resolver/maven-resolver-transport-http \
maven-resolver/maven-resolver-transport-wagon \ maven-resolver/maven-resolver-transport-wagon \
maven-resolver/maven-resolver-util \ maven-resolver/maven-resolver-util \
maven-shared-utils/maven-shared-utils \ maven-shared-utils/maven-shared-utils \