[maven-debian-helper] 01/01: No longer use the Maven 2 jars
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Sep 3 23:22:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.
commit 3acd61b8f933162ad416426c45203cb62d774877
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 4 01:08:20 2017 +0200
No longer use the Maven 2 jars
---
debian/changelog | 7 +++++++
debian/maven.rules | 2 +-
debian/rules | 6 +++---
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8c84c9..d1eec77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-debian-helper (2.2.5) unstable; urgency=medium
+
+ * Team upload.
+ * No longer use the Maven 2 jars
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 04 Sep 2017 01:08:08 +0200
+
maven-debian-helper (2.2.4) unstable; urgency=medium
* Team upload.
diff --git a/debian/maven.rules b/debian/maven.rules
index 91f38da..706c863 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,3 @@
junit junit jar s/4\..*/4.x/
-org.apache.maven maven-embedder * s/3\..*/3.x/
+org.apache.maven maven-* * s/.*/3.x/ * *
org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
diff --git a/debian/rules b/debian/rules
index 9be8acd..b0f45cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@ include /usr/share/cdbs/1/class/ant.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(shell echo ${DEB_UPSTREAM_VERSION} | sed -r 's/([0-9\.]+).*/\1/')
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-junit junit commons-io plexus-classworlds maven-core maven-artifact maven-artifact-manager maven-core-3.x maven-model \
- maven-embedder maven3-plugin-api maven-plugin-annotations maven-scm-api velocity file-management plexus-utils maven-resolver-api maven-resolver-util \
- plexus-container-default-alpha maven-repo-helper
+DEB_JARS := ant-junit junit commons-io plexus-classworlds maven-artifact-3.x maven-core-3.x maven-model-3.x maven-embedder-3.x \
+ maven-plugin-api-3.x maven-plugin-annotations maven-scm-api velocity file-management plexus-utils maven-resolver-api maven-resolver-util \
+ plexus-container-default-1.5 maven-repo-helper
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git
More information about the pkg-java-commits
mailing list