rpm/maven
SHA256
1
0
Fork 0
forked from pool/maven
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=40

Browse Source
This commit is contained in:
Fridrich Strba 2022-04-26 20:40:36 +00:00 committed by Git OBS Bridge
parent eb37680191
commit 15dcdb6a8d
15 changed files with 321 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 <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/6] Adapt mvn script Subject: [PATCH 1/3] Adapt mvn script
--- ---
apache-maven/src/bin/mvn | 13 +++++++++-- apache-maven/src/bin/mvn | 19 ++++++++++++++++---
1 file changed, 10 insertions(+), 3 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 dfa384b8e..605c0edd3 100755 index a554c66..818cf70 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 @@
@ -20,11 +20,11 @@ index dfa384b8e..605c0edd3 100755
# 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.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -37,12 +37,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then @@ -37,12 +37,24 @@
. /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
+ +
@ -34,12 +34,18 @@ index dfa384b8e..605c0edd3 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;
@@ -67,7 +73,8 @@ done @@ -67,7 +79,8 @@
saveddir=`pwd` saveddir=`pwd`
@ -49,15 +55,15 @@ index dfa384b8e..605c0edd3 100755
# make it fully qualified # make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
@@ -105,7 +112,7 @@ @@ -105,7 +118,7 @@
exit 1 exit 1
fi fi
-CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar` -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 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
-- --
2.36.0 2.17.1

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

@ -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 <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/6] Invoke logback via reflection Subject: [PATCH 2/4] Invoke logback via reflection
--- ---
.../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++-----
@ -49,5 +49,5 @@ index 5d9fab744..ced38cb5a 100644
@Override @Override
-- --
2.36.0 2.21.0

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

@ -1,96 +0,0 @@
From a8fc2a43c376db91aebd631acdeeef88673df0d1 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/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<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.0

16
0003-Use-non-shaded-HTTP-wagon.patch → 0004-Use-non-shaded-HTTP-wagon.patch
View File

@ -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 <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 1 Jul 2019 09:51:56 +0200 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 --------------- apache-maven/pom.xml | 15 ---------------
@ -9,7 +9,7 @@ Subject: [PATCH 3/6] Use non-shaded HTTP wagon
2 files changed, 16 deletions(-) 2 files changed, 16 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml 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 --- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml +++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@ under the License. @@ -63,21 +63,6 @@ under the License.
@ -32,13 +32,13 @@ index 7ff412767..b15091576 100644
- </exclusion> - </exclusion>
- </exclusions> - </exclusions>
</dependency> </dependency>
<dependency> <!-- This is included in Wagon HTTP.
<groupId>org.slf4j</groupId> We are just making the dependency explicit
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index c319cae26..42afab5f1 100644 index 237cdc39e..85436c54d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -333,7 +333,6 @@ under the License. @@ -334,7 +334,6 @@
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version> <version>${wagonVersion}</version>
@ -47,5 +47,5 @@ index c319cae26..42afab5f1 100644
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
-- --
2.36.0 2.21.0

6
0005-Port-to-maven-resolver-1.7.2.patch
View File

@ -1,7 +1,7 @@
From d7de16c8771c76afad3e635f82372948a98249a2 Mon Sep 17 00:00:00 2001 From b23d2957440cb4ff06a289b4864f782794b45f52 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com> From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 17 Dec 2021 13:05:49 +0100 Date: Fri, 17 Dec 2021 13:05:49 +0100
Subject: [PATCH 5/6] Port to maven-resolver 1.7.2 Subject: [PATCH] Port to maven-resolver 1.7.2
--- ---
.../org/apache/maven/repository/internal/MavenAetherModule.java | 2 +- .../org/apache/maven/repository/internal/MavenAetherModule.java | 2 +-
@ -21,5 +21,5 @@ index 41e98aaea..d72e3c0f3 100644
import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver; import org.eclipse.aether.impl.VersionRangeResolver;
-- --
2.36.0 2.31.1

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

@ -1,37 +0,0 @@
From c4c50ed5cd3e8de7037818cf6df57abdf75933fa 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/6] 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.0

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

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:298bfb6172c134655f4f5608342f9c7bc798918ac165b8ded4af800be184ab9b
size 2774526

11
apache-maven-3.8.4-src.tar.gz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCgAGBQJhkNSDAAoJEBoqHJS96JaIvpsIAKbTcPc3dfJEp7O3oH6PTcvU
5zeycOGGptm/9k/hCNlzV79YEMDnyZSnEtCBv7/Y3cqEO+WLYeX/0YWxuAIKnBYH
telpXcXVRauV7+eAxgu3nJuIu56eJtGrwndpdYRwkJ94hRhWMG7RsksX3/GtW12u
fH/J/0pYrW1uSIMihk0mEV4lShqhC+mnF6LMM1T3Vl5c9FvTEx0OZWlHd9r10wfD
bX9yXeAt7ckq7EVg0JhW+dpl4Gp5oTwXvNydUMTlOt0NkkC+GHxTDn/BipUt2yau
Sg/J/BKP7/8W0MhnY0tM7x2s8gzc4z7Y3xuzJ+UNCWbO1LREowre8CPVMXoEuSA=
=29QL
-----END PGP SIGNATURE-----

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77d9c6b4d81338490a4d9e940142e3503999b3dca1c4d25f0ae02e22a94a1b2b
size 5132

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

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

11
apache-maven-3.8.5-src.tar.gz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCgAGBQJiI4SRAAoJEBoqHJS96JaIYX4H/1cyRz6yNJAUhKEBuwZ8A1GC
9NS8fSQSw7yxYADcaFr2DVPspOqZgk3AvdPFhTcA+0hzf1Wt45A5I/UFL7UQEoDE
g+vS+czb9hKt45FwnFTzk8sQ1YkoMJ9ZNMYjntMRt3DDCRWwxRuVVnNBzoLSDHd9
4KZs+ABIGMV+gqJBZum0u0j0SdDgd+3Rm4++zjXiSx2lSbwus8+DNLX6cxvpNG4/
IswftTmBcu6OS/f0G9wrKlNTDX/e29w4gjoRXUEQ8GjHblbsIIqdJF1qGjYJ0mWL
4Tr8xkcaF9aKdwNMRYb1jLtrnAdNYX5vRg4fAmzl9H26eEGFNmbjh/Lk9TRkeL8=
=AU+b
-----END PGP SIGNATURE-----

302
maven.keyring
View File

@ -68,12 +68,9 @@ HmizzrWfCbnt2Epa3EGsFv4tIRd1cG5IAa41gvh+pX32symEwrh2wcbDU7YPjrMC
=vtG4 =vtG4
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
pub rsa8192 2015-03-04 [SC] [expires: 2024-08-15] pub rsa8192/160788A2 2015-03-04 [SC] [expires: 2021-08-15]
AE9E53FC28FF2AB1012273D0BF1518E0160788A2 AE9E53FC28FF2AB1012273D0BF1518E0160788A2
uid [ultimate] Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org> uid [ultimate] Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
sig 3 BF1518E0160788A2 2022-03-25 Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
sig 3 BF1518E0160788A2 2017-08-13 Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
sig 3 BF1518E0160788A2 2015-03-04 Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
@ -99,167 +96,120 @@ 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 =NkUD
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
=dagP
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
pub 1024D/C560DD8B 2005-09-19 Emmanuel Venisse <evenisse@apache.org> pub 1024D/C560DD8B 2005-09-19 Emmanuel Venisse <evenisse@apache.org>
@ -901,6 +851,7 @@ sig 3 B3A2D3B1 2007-03-28 John Casey (Maven PMC Member) <john@maven.org>
sub 2048g/D6CD44BD 2007-03-28 sub 2048g/D6CD44BD 2007-03-28
sig B3A2D3B1 2007-03-28 John Casey (Maven PMC Member) <john@maven.org> sig B3A2D3B1 2007-03-28 John Casey (Maven PMC Member) <john@maven.org>
gpg: WARNING: unsafe enclosing directory permissions on configuration file `/home/jdcasey/.gnupg/gpg.conf'
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.3 (GNU/Linux) Version: GnuPG v1.4.3 (GNU/Linux)
@ -3788,22 +3739,3 @@ kSkTFiY0ACKu0OiXgajQ75g2LVI2uXkezd8cyzD89a/c5QhvLV3fbwh/hpjHNaI2
fUB7vVlzPnBDQ+imN5uNOymMNiLYjHGN2OXzU0XRDL7u0g== fUB7vVlzPnBDQ+imN5uNOymMNiLYjHGN2OXzU0XRDL7u0g==
=c5jm =c5jm
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
pub ed25519/0x0E593F2ED433A5AD 2020-11-20 [SC] [expires: 2027-11-19]
Key fingerprint = 1083 EA11 7629 CBDB F77F D606 0E59 3F2E D433 A5AD
uid [ultimate] Benjamin Marwell <bmarwell@apache.org>
sig 3 0x0E593F2ED433A5AD 2020-11-20 never Benjamin Marwell <bmarwell@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEX7e9phYJKwYBBAHaRw8BAQdAVOaVsM6Zr/optjYaqQZmaoP9iuulWoOFXazU
YmDAj7G0JkJlbmphbWluIE1hcndlbGwgPGJtYXJ3ZWxsQGFwYWNoZS5vcmc+iJYE
ExYIAD4CGwMCHgECF4AFCQ0oez4WIQQQg+oRdinL2/d/1gYOWT8u1DOlrQUCX7fQ
bQULCQgHAgYVCgkICwIEFgIDAQAKCRAOWT8u1DOlrZMaAP9DGTywLXK2pHH8wcr3
rp9fH03eKBzPo8FEA9z2Fsq7VgD/R8cz/c8X22O14pIlAq54ynki1nOz5SFsNczv
ombExguIXQQTEQoAHRYhBBHWYbD16CH8YeURqnFcLiH9WAzABQJft83RAAoJEHFc
LiH9WAzAjMoAnRoGCUPsMllTW+w5X4aNGGRNroKFAJ9oEIJD8jvh1zGpalBdlYJN
Ub0cvA==
=NCZf
-----END PGP PUBLIC KEY BLOCK-----

28
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.8.5 Version: 3.8.4
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
@ -36,11 +36,11 @@ Source4: https://downloads.apache.org/maven/KEYS#/%{name}.keyring
Source10: apache-%{name}-%{version}-build.tar.xz 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
# Used only when %%without logback is in effect
Patch2: 0002-Invoke-logback-via-reflection.patch Patch2: 0002-Invoke-logback-via-reflection.patch
Patch3: 0003-Use-non-shaded-HTTP-wagon.patch Patch3: qdox-2.0.1.patch
Patch4: 0004-Remove-dependency-on-powermock.patch Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
Patch5: 0005-Port-to-maven-resolver-1.7.2.patch Patch5: 0005-Port-to-maven-resolver-1.7.2.patch
Patch6: 0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec BuildRequires: apache-commons-codec
@ -185,11 +185,9 @@ BuildArch: noarch
%setup -q -n apache-%{name}-%{version} -a10 %setup -q -n apache-%{name}-%{version} -a10
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -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
@ -218,10 +216,13 @@ sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.prop
sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties` sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties`
sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties` sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties`
%pom_remove_dep -r :logback-classic
%{mvn_package} :apache-maven __noinstall %{mvn_package} :apache-maven __noinstall
%if %{without logback}
%pom_remove_dep -r :logback-classic
%patch2 -p1
%endif
%{mvn_alias} :maven-resolver-provider :maven-aether-provider %{mvn_alias} :maven-resolver-provider :maven-aether-provider
# xmvn depends on this version, so we want to avoid duplicate apache-commons-lang3 jars in xmvn # xmvn depends on this version, so we want to avoid duplicate apache-commons-lang3 jars in xmvn
@ -286,7 +287,7 @@ for i in \
done done
%install %install
%mvn_install %{mvn_install}
%fdupes %{buildroot}%{_javadocdir} %fdupes %{buildroot}%{_javadocdir}
install -d -m 755 %{buildroot}%{homedir}/boot install -d -m 755 %{buildroot}%{homedir}/boot
@ -359,12 +360,11 @@ ln -sf %{confdir}/settings.xml %{buildroot}%{homedir}/conf/settings.xml
mv %{buildroot}%{homedir}/conf/logging %{buildroot}%{confdir}/ mv %{buildroot}%{homedir}/conf/logging %{buildroot}%{confdir}/
ln -sf %{confdir}/logging %{buildroot}%{homedir}/conf ln -sf %{confdir}/logging %{buildroot}%{homedir}/conf
# Ghosts for alternatives
install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_bindir}
ln -sf %{homedir}/bin/mvn %{buildroot}%{_bindir}/mvn ln -sf %{homedir}/bin/mvn %{buildroot}%{_bindir}/
ln -sf %{homedir}/bin/mvnDebug %{buildroot}%{_bindir}/mvnDebug ln -sf %{homedir}/bin/mvnDebug %{buildroot}%{_bindir}/
install -d -m 755 %{buildroot}%{_mandir}/man1/ install -d -m 755 %{buildroot}%{_mandir}/man1/
ln -sf %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/mvn.1.gz ln -sf %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/
%files lib -f .mfiles %files lib -f .mfiles
%doc README.md %doc README.md
@ -380,7 +380,7 @@ ln -sf %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/mvn.1.gz
%{_bindir}/mvn %{_bindir}/mvn
%{_bindir}/mvnDebug %{_bindir}/mvnDebug
%{_datadir}/bash-completion %{_datadir}/bash-completion
%{_mandir}/man1/mvn.1.gz %{_mandir}/man1/mvn.1%{?ext_man}
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE %license LICENSE NOTICE

120
qdox-2.0.1.patch Normal file
View File

@ -0,0 +1,120 @@
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java 2022-01-13 07:08:06.182993103 +0100
@@ -157,7 +157,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java 2022-01-13 07:10:30.471820999 +0100
@@ -198,7 +198,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java 2022-01-13 07:10:02.863663262 +0100
@@ -200,7 +200,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java 2022-01-13 07:11:56.088310105 +0100
@@ -94,8 +94,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java 2022-01-13 08:09:14.744957009 +0100
@@ -97,8 +97,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java 2022-01-13 07:36:03.136896661 +0100
@@ -90,8 +90,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java 2022-01-13 07:12:29.108498755 +0100
@@ -240,7 +240,7 @@
}
@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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java 2022-01-13 07:07:32.302798450 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java 2022-01-13 07:12:55.192647787 +0100
@@ -96,8 +96,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java 2022-01-13 07:11:14.312071457 +0100
@@ -135,7 +135,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java 2022-01-13 07:11:45.096247306 +0100
@@ -85,8 +85,8 @@
* 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_ );
}