[Git][java-team/gradle][master] 3 commits: Depend on maven-resolver-1.6 instead of maven-resolver
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue Dec 17 10:40:19 GMT 2024
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle
Commits:
ff69897e by Emmanuel Bourg at 2024-12-17T11:37:31+01:00
Depend on maven-resolver-1.6 instead of maven-resolver
- - - - -
5548c629 by Emmanuel Bourg at 2024-12-17T11:37:34+01:00
Standards-Version updated to 4.7.0
- - - - -
1ec722a4 by Emmanuel Bourg at 2024-12-17T11:39:36+01:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/gradle.links
- debian/maven.rules
- debian/patches/eclipse-aether.patch
- debian/patches/maven-3.3-compatibility.patch
- debian/patches/use-local-artifacts.patch
- debian/substituteDependencies.gradle
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gradle (4.4.1-21) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on maven-resolver-1.6 instead of maven-resolver
+ * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 17 Dec 2024 11:39:28 +0100
+
gradle (4.4.1-20) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -47,7 +47,7 @@ Build-Depends: ant,
libjsch-java,
libkryo-java,
liblogback-java,
- libmaven-resolver-java,
+ libmaven-resolver-1.6-java,
libmaven3-core-java (>= 3.5.0),
libnative-platform-java (>= 0.14),
libnekohtml-java,
@@ -67,7 +67,7 @@ Build-Depends: ant,
libxerces2-java,
maven-repo-helper,
testng
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/gradle.git
Vcs-Browser: https://salsa.debian.org/java-team/gradle
Homepage: https://gradle.org
@@ -155,7 +155,7 @@ Depends: ant-optional,
libjcifs-java,
libjgit-java,
libjs-jquery,
- libmaven-resolver-java,
+ libmaven-resolver-1.6-java,
libmaven3-core-java (>= 3.5.0),
libobjenesis-java,
libplexus-component-annotations-java,
=====================================
debian/gradle.links
=====================================
@@ -4,4 +4,11 @@
# hence we need to place the symlink.
usr/share/gradle/bin/gradle usr/bin/gradle
-usr/share/java/gradle-launcher-${GRADLE_VERSION}.jar usr/share/gradle/lib/gradle-launcher-${GRADLE_VERSION}.jar
\ No newline at end of file
+usr/share/java/gradle-launcher-${GRADLE_VERSION}.jar usr/share/gradle/lib/gradle-launcher-${GRADLE_VERSION}.jar
+
+
+/usr/share/java/maven-resolver-1.6-api-1.6.3.jar usr/share/gradle/lib/maven-resolver-api.jar
+/usr/share/java/maven-resolver-1.6-connector-basic-1.6.3.jar usr/share/gradle/lib/maven-resolver-connector-basic.jar
+/usr/share/java/maven-resolver-1.6-impl-1.6.3.jar usr/share/gradle/lib/maven-resolver-impl.jar
+/usr/share/java/maven-resolver-1.6-spi-1.6.3.jar usr/share/gradle/lib/maven-resolver-spi.jar
+/usr/share/java/maven-resolver-1.6-util-1.6.3.jar usr/share/gradle/lib/maven-resolver-util.jar
=====================================
debian/maven.rules
=====================================
@@ -12,4 +12,5 @@ antlr antlr * s/2\..*/2.x/
commons-collections commons-collections * s/3\..*/3.x/
junit junit * s/4\..*/4.x/
org.apache.maven maven-* * s/3\..*/3.x/
+org.apache.maven.resolver maven-resolver* * s/.*/1.6.x/
org.fusesource.jansi jansi * s/1\..*/1.x/
=====================================
debian/patches/eclipse-aether.patch
=====================================
@@ -27,11 +27,11 @@ Forwarded: no
- dependency "org.sonatype.aether:aether-spi:1.13.1 at jar"
- dependency "org.sonatype.aether:aether-util:1.13.1 at jar"
- dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1 at jar'
-+ dependency 'org.apache.maven.resolver:maven-resolver-api:1.13.1 at jar'
-+ dependency 'org.apache.maven.resolver:maven-resolver-impl:1.13.1 at jar'
-+ dependency 'org.apache.maven.resolver:maven-resolver-spi:1.13.1 at jar'
-+ dependency 'org.apache.maven.resolver:maven-resolver-util:1.13.1 at jar'
-+ dependency 'org.apache.maven.resolver:maven-resolver-connector-basic:1.13.1 at jar'
++ dependency 'org.apache.maven.resolver:maven-resolver-api:1.6.x'
++ dependency 'org.apache.maven.resolver:maven-resolver-impl:1.6.x'
++ dependency 'org.apache.maven.resolver:maven-resolver-spi:1.6.x'
++ dependency 'org.apache.maven.resolver:maven-resolver-util:1.6.x'
++ dependency 'org.apache.maven.resolver:maven-resolver-connector-basic:1.6.x'
}
libraries.spock = [
=====================================
debian/patches/maven-3.3-compatibility.patch
=====================================
@@ -46,9 +46,9 @@ Forwarded: no
dependency 'org.apache.maven.wagon:wagon-file:2.4 at jar'
dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
@@ -158,6 +165,8 @@
- dependency 'org.apache.maven.resolver:maven-resolver-spi:1.13.1 at jar'
- dependency 'org.apache.maven.resolver:maven-resolver-util:1.13.1 at jar'
- dependency 'org.apache.maven.resolver:maven-resolver-connector-basic:1.13.1 at jar'
+ dependency 'org.apache.maven.resolver:maven-resolver-spi:1.6.x'
+ dependency 'org.apache.maven.resolver:maven-resolver-util:1.6.x'
+ dependency 'org.apache.maven.resolver:maven-resolver-connector-basic:1.6.x'
+
+ dependency 'org.apache.commons:commons-lang3:debian'
}
=====================================
debian/patches/use-local-artifacts.patch
=====================================
@@ -97,7 +97,7 @@ Forwarded: not-needed
+ dependency 'org.apache.maven.wagon:wagon-http-shared:2.4 at jar'
//eather:
- dependency 'org.apache.maven.resolver:maven-resolver-api:1.13.1 at jar'
+ dependency 'org.apache.maven.resolver:maven-resolver-api:1.6.x'
@@ -200,8 +199,8 @@
dependency libraries.mina
}
=====================================
debian/substituteDependencies.gradle
=====================================
@@ -16,11 +16,11 @@ configurations.all {
case 'jetty': details.useTarget('org.eclipse.jetty:jetty9-server:debian'); return;
// Eclipse Aether
- case 'aether-api': details.useTarget('org.eclipse.aether:maven-resolver-api:debian'); return;
- case 'aether-impl': details.useTarget('org.eclipse.aether:maven-resolver-impl:debian'); return;
- case 'aether-spi': details.useTarget('org.eclipse.aether:maven-resolver-spi:debian'); return;
- case 'aether-util': details.useTarget('org.eclipse.aether:maven-resolver-util:debian'); return;
- case 'aether-connector-wagon': details.useTarget('org.eclipse.aether:maven-resolver-connector-basic:debian'); return;
+ case 'aether-api': details.useTarget('org.eclipse.aether:maven-resolver-api:1.6.x'); return;
+ case 'aether-impl': details.useTarget('org.eclipse.aether:maven-resolver-impl:1.6.x'); return;
+ case 'aether-spi': details.useTarget('org.eclipse.aether:maven-resolver-spi:1.6.x'); return;
+ case 'aether-util': details.useTarget('org.eclipse.aether:maven-resolver-util:1.6.x'); return;
+ case 'aether-connector-wagon': details.useTarget('org.eclipse.aether:maven-resolver-connector-basic:1.6.x'); return;
// Misc
case 'antlr': details.useVersion('2.x'); return;
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/eec89b31a252685e65f19edcbbdad190ea7e4031...1ec722a4275419a5a2b40931cb1fcb924bc7d322
--
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/eec89b31a252685e65f19edcbbdad190ea7e4031...1ec722a4275419a5a2b40931cb1fcb924bc7d322
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20241217/b7d49b2d/attachment.htm>
More information about the pkg-java-commits
mailing list