Tony Mancill pushed to branch master at Debian Java Maintainers /
maven-debian-helper
Commits:
67b0aeef by tony mancill at 2023-02-26T17:05:11-08:00
Install versioned JAR files and versionless symlinks (Closes: #1007923)
Thank you to Alexandre Rossi for the patch.
- - - - -
19504f14 by tony mancill at 2023-02-26T17:08:26-08:00
Freshen years in debian/copyright
- - - - -
a79e7443 by tony mancill at 2023-02-26T17:09:00-08:00
Bump Standards-Version to 4.6.2
- - - - -
375417c9 by tony mancill at 2023-02-26T18:09:27-08:00
Prepare changelog for upload to experimental
- - - - -
c03c5403 by tony mancill at 2023-06-11T09:01:45-07:00
Merge branch 'debian/experimental' and update for 2.6.4
- - - - -
4 changed files:
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
- debian/changelog
- debian/control
- debian/copyright
Changes:
=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
=====================================
@@ -592,12 +592,10 @@ public class SysInstallMojo extends AbstractMojo {
if (jarFile.exists()) {
getLog().info("Install jar for " + artifactId + " into
/usr/share/java");
mkdir(compatSharePath());
- if (noUsjVersionless) {
- FileUtils.copyFile(jarFile, new
File(versionedFullCompatPath()));
- } else {
- FileUtils.copyFile(jarFile, new File(fullCompatPath()));
- link(destUsjJarName(), fullCompatPath());
- link(destUsjJarName(), versionedFullCompatPath());
+ FileUtils.copyFile(jarFile, new File(versionedFullCompatPath()));
+ if (!noUsjVersionless) {
+ link(destUsjVersionnedJarName(), fullCompatPath());
+ link(destUsjVersionnedJarName(), versionedFullCompatPath());
}
}
}
@@ -611,11 +609,7 @@ public class SysInstallMojo extends AbstractMojo {
mkdir(fullRepoPath());
String targetPath = "";
- if (noUsjVersionless) {
- targetPath = versionedFullCompatPath();
- } else {
- targetPath = fullCompatPath();
- }
+ targetPath = versionedFullCompatPath();
link(DirectoryUtils.relativePath(fullRepoPath(), targetPath),
jarDestPath());
if (debianVersion != null && !debianVersion.equals(version)) {
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+maven-debian-helper (2.6.4) unstable; urgency=medium
+
+ * Team upload.
+ * Merge changes from 2.6.3~exp1 (Closes: #1007923)
+
+ -- tony mancill <tmanc...@debian.org> Sun, 11 Jun 2023 09:00:35 -0700
+
maven-debian-helper (2.6.3) unstable; urgency=medium
* Support the MAVEN_OPTS environment variable to pass JVM arguments
@@ -6,6 +13,17 @@ maven-debian-helper (2.6.3) unstable; urgency=medium
-- Emmanuel Bourg <ebo...@apache.org> Fri, 12 May 2023 01:20:16 +0200
+maven-debian-helper (2.6.3~exp1) experimental; urgency=medium
+
+ * Team upload to experimental.
+ * Comply with Java policy to install versioned JAR archives
+ and versionless symlinks. (Closes: #1007923)
+ Thank you to Alexandre Rossi for the patch.
+ * Freshen years in debian/copyright
+ * Bump Standards-Version to 4.6.2
+
+ -- tony mancill <tmanc...@debian.org> Sun, 26 Feb 2023 17:09:23 -0800
+
maven-debian-helper (2.6.2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Build-Depends:
maven-ant-helper,
maven-repo-helper (>= 1.10~)
Rules-Requires-Root: no
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/maven-debian-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-debian-helper
Homepage: https://wiki.debian.org/Java/MavenBuilder
=====================================
debian/copyright
=====================================
@@ -9,9 +9,11 @@ Copyright: 2008-2009, Torsten Werner <twer...@debian.org>
2013, Thomas Koch <tho...@koch.ro>
2013, Jakub Adam <jakub.a...@ktknet.cz>
2013, Wolodja Wentland <deb...@babilen5.org>
- 2013-2015, Tony Mancill <tmanc...@debian.org>
- 2013-2016, Emmanuel Bourg <ebo...@apache.org>
+ 2013-2023, Tony Mancill <tmanc...@debian.org>
+ 2013-2023, Emmanuel Bourg <ebo...@apache.org>
2015, Andrew Schurman <arcticwat...@gmail.com>
+ 2023, Alexandre Rossi <n...@zincube.net>
+ 2023, Jochen Sprickerhof <jspri...@debian.org>
License: Apache-2.0
Files:
maven-debian-helper/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
View it on GitLab:
https://salsa.debian.org/java-team/maven-debian-helper/-/compare/ca687344500141f54bf53883409b8c63e14bd14c...c03c5403539eb4dc35947b35f51d72d74620637a
--
View it on GitLab:
https://salsa.debian.org/java-team/maven-debian-helper/-/compare/ca687344500141f54bf53883409b8c63e14bd14c...c03c5403539eb4dc35947b35f51d72d74620637a
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
