forked from java-packages/maven4
Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
800e5c2465 | ||
|
|
dc1918c368 | ||
|
|
300acb07c6 | ||
|
|
485ab18ef9 |
1444
0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
Normal file
1444
0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 12 19:26:11 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use the compatibility version of maven-resolver2, since the
|
||||
version 2.0.15 is backward compatible with the version 2.0.14
|
||||
- Require methanol that is now dependency of maven-resolver2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 06:14:07 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Require the compatibility version of plexus-xml4 to avoid breaking
|
||||
on each upgrade
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 06:43:33 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Specify required maven-resolver version since the patch ports
|
||||
maven4 to new APIs appeared in 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 07:08:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
+ Fix build with maven-resolver 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 21:44:26 UTC 2025 - Robert Munteanu <rombert@apache.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package maven4-bootstrap
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -35,8 +35,9 @@ Source10: apache-%{base_name}-build.tar.xz
|
||||
Patch1: 0001-Adapt-mvn-script.patch
|
||||
# Downstream-specific, avoids dependency on logback
|
||||
Patch2: 0002-Invoke-logback-via-reflection.patch
|
||||
Patch3: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch4: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel >= 17
|
||||
BuildRequires: javapackages-local
|
||||
@@ -60,6 +61,7 @@ reporting and documentation from a central piece of information.
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
|
||||
%pom_remove_dep -r :junit-bom
|
||||
%pom_remove_dep -r :mockito-bom
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 12 19:26:11 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use the compatibility version of maven-resolver2, since the
|
||||
version 2.0.15 is backward compatible with the version 2.0.14
|
||||
- Require methanol that is now dependency of maven-resolver2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 06:14:07 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Require the compatibility version of plexus-xml4 to avoid breaking
|
||||
on each upgrade
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 06:43:33 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Specify required maven-resolver version since the patch ports
|
||||
maven4 to new APIs appeared in 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 07:08:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
+ Fix build with maven-resolver 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 21:44:26 UTC 2025 - Robert Munteanu <rombert@apache.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package maven4-testing
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -35,15 +35,16 @@ Source10: apache-%{base_name}-build.tar.xz
|
||||
Patch1: 0001-Adapt-mvn-script.patch
|
||||
# Downstream-specific, avoids dependency on logback
|
||||
Patch2: 0002-Invoke-logback-via-reflection.patch
|
||||
Patch3: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch4: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: apiguardian
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 17
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: junit5-minimal
|
||||
BuildRequires: maven-resolver2-api
|
||||
BuildRequires: maven-resolver2-api >= 2.0.14
|
||||
BuildRequires: maven-resolver2-connector-basic
|
||||
BuildRequires: maven-resolver2-impl
|
||||
BuildRequires: maven-resolver2-spi
|
||||
@@ -80,6 +81,10 @@ BuildArch: noarch
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
|
||||
%pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4
|
||||
%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2
|
||||
|
||||
%pom_remove_dep -r :junit-bom
|
||||
%pom_remove_dep -r :mockito-bom
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 12 19:26:11 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use the compatibility version of maven-resolver2, since the
|
||||
version 2.0.15 is backward compatible with the version 2.0.14
|
||||
- Require methanol that is now dependency of maven-resolver2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 06:14:07 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Require the compatibility version of plexus-xml4 to avoid breaking
|
||||
on each upgrade
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 06:43:33 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Specify required maven-resolver version since the patch ports
|
||||
maven4 to new APIs appeared in 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 07:08:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
+ Fix build with maven-resolver 2.0.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 21:44:26 UTC 2025 - Robert Munteanu <rombert@apache.org>
|
||||
|
||||
|
||||
21
maven4.spec
21
maven4.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package maven4
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -37,8 +37,9 @@ Source10: apache-%{base_name}-build.tar.xz
|
||||
Patch1: 0001-Adapt-mvn-script.patch
|
||||
# Downstream-specific, avoids dependency on logback
|
||||
Patch2: 0002-Invoke-logback-via-reflection.patch
|
||||
Patch3: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch4: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch
|
||||
Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch
|
||||
Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: aopalliance
|
||||
BuildRequires: apache-commons-cli
|
||||
@@ -68,9 +69,9 @@ BuildRequires: jline3-reader
|
||||
BuildRequires: jline3-style
|
||||
BuildRequires: jline3-terminal
|
||||
BuildRequires: jline3-terminal-jni
|
||||
BuildRequires: maven-resolver2-api
|
||||
BuildRequires: maven-resolver2-api >= 2.0.14
|
||||
BuildRequires: maven-resolver2-connector-basic
|
||||
BuildRequires: maven-resolver2-impl
|
||||
BuildRequires: maven-resolver2-impl >= 2.0.14
|
||||
BuildRequires: maven-resolver2-named-locks
|
||||
BuildRequires: maven-resolver2-spi
|
||||
BuildRequires: maven-resolver2-transport-apache
|
||||
@@ -82,6 +83,7 @@ BuildRequires: maven-wagon-file
|
||||
BuildRequires: maven-wagon-http
|
||||
BuildRequires: maven-wagon-http-shared
|
||||
BuildRequires: maven-wagon-provider-api
|
||||
BuildRequires: methanol
|
||||
BuildRequires: modello
|
||||
BuildRequires: objectweb-asm
|
||||
BuildRequires: plexus-classworlds
|
||||
@@ -104,8 +106,8 @@ BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||
#!BuildIgnore: %{name}-bootstrap
|
||||
#!BuildIgnore: %{name}-lib
|
||||
#!BuildIgnore: plexus-sec-dispatcher
|
||||
Requires: java-headless >= 17
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: java-headless >= 17
|
||||
|
||||
%description
|
||||
Maven is a software project management and comprehension tool. Based on the
|
||||
@@ -153,6 +155,7 @@ Requires: maven-wagon-file
|
||||
Requires: maven-wagon-http
|
||||
Requires: maven-wagon-http-shared
|
||||
Requires: maven-wagon-provider-api
|
||||
Requires: methanol
|
||||
Requires: objectweb-asm
|
||||
Requires: plexus-classworlds
|
||||
Requires: plexus-containers-component-annotations
|
||||
@@ -187,6 +190,10 @@ BuildArch: noarch
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
|
||||
%pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4
|
||||
%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2
|
||||
|
||||
%pom_remove_dep -r :junit-bom
|
||||
%pom_remove_dep -r :mockito-bom
|
||||
@@ -276,6 +283,7 @@ build-jar-repository -s lib \
|
||||
maven-resolver/maven-resolver-transport-wagon-2 \
|
||||
maven-resolver/maven-resolver-util-2 \
|
||||
maven-wagon/provider-api \
|
||||
methanol \
|
||||
objectweb-asm/asm \
|
||||
org.eclipse.sisu.inject \
|
||||
org.eclipse.sisu.plexus \
|
||||
@@ -389,6 +397,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
|
||||
maven-wagon/http \
|
||||
maven-wagon/http-shared \
|
||||
maven-wagon/provider-api \
|
||||
methanol \
|
||||
objectweb-asm/asm \
|
||||
org.eclipse.sisu.inject \
|
||||
org.eclipse.sisu.plexus \
|
||||
|
||||
Reference in New Issue
Block a user