[maven-debian-helper] 04/21: Update maven version to the latest in sid
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 13 15:05:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-debian-helper-2.0
in repository maven-debian-helper.
commit 271abe1c081c56f02910aade763cfb1a18e0d1b7
Author: Andrew Schurman <arcticwaters at gmail.com>
Date: Fri Sep 5 20:05:53 2014 -0700
Update maven version to the latest in sid
---
bin/mh_resolve_dependencies | 2 +-
bin/mvn-debian | 6 ++---
debian-maven-plugin/pom.xml | 2 +-
debian/changelog | 6 +++++
debian/control | 4 ++--
debian/install | 4 ++--
debian/maven.rules | 1 +
debian/rules | 4 ++--
etc/m2-debian-nodocs.conf | 2 +-
etc/m2-debian.conf | 2 +-
maven-build-nodocs/pom.xml | 2 +-
maven-debian-helper/pom.xml | 6 ++---
.../src/main/java/org/debian/maven/Wrapper.java | 8 +++----
maven-packager-utils/pom.xml | 6 +----
pom.xml | 27 +++++++++-------------
share/cdbs/1/class/maven-vars.mk | 8 +++----
share/cdbs/1/class/maven.mk | 4 ++--
share/maven-debian-helper/copy-repo.sh | 2 +-
share/perl/maven.pm | 8 +++----
19 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/bin/mh_resolve_dependencies b/bin/mh_resolve_dependencies
index 9ce6729..c51789d 100644
--- a/bin/mh_resolve_dependencies
+++ b/bin/mh_resolve_dependencies
@@ -3,7 +3,7 @@
MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
. /usr/share/maven-repo-helper/mh_lib.sh
-CLASSPATH="/usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar"
+CLASSPATH="/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar"
syntax()
{
diff --git a/bin/mvn-debian b/bin/mvn-debian
index 9090be5..11852e2 100755
--- a/bin/mvn-debian
+++ b/bin/mvn-debian
@@ -4,10 +4,10 @@
# line in a similar way as our cdbs snippets work. Production use is
# not supported by the maintainer of maven-debian-helper.
-DEB_CLASSPATH=/usr/share/java/classworlds.jar
-JAVA_OPTS=-Dclassworlds.conf=/etc/maven2/m2-debian.conf
+DEB_CLASSPATH=/usr/share/java/plexus-classworlds2.jar
+JAVA_OPTS=-Dclassworlds.conf=/etc/maven/m2-debian.conf
MAIN_CLASS=org.codehaus.classworlds.Launcher
-MAVEN_OPTS=-s/etc/maven2/settings-debian.xml
+MAVEN_OPTS=-s/etc/maven/settings-debian.xml
TMP_DIR=$(mktemp -d ${TMP:-/tmp}/mvn-deb.XXXXXXXXXX)
/usr/share/maven-debian-helper/copy-repo.sh $TMP_DIR
diff --git a/debian-maven-plugin/pom.xml b/debian-maven-plugin/pom.xml
index 0316060..0bb7fd6 100644
--- a/debian-maven-plugin/pom.xml
+++ b/debian-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>1.6.9</version>
+ <version>2.0.0</version>
</parent>
<artifactId>debian-maven-plugin</artifactId>
diff --git a/debian/changelog b/debian/changelog
index 24a6f26..d78a894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maven-debian-helper (2.0.0) UNRELEASED; urgency=medium
+
+ * Update Maven to version 3.0.5
+
+ -- Andrew Schurman <arcticwaters at gmail.com> Mon, 16 Mar 2015 18:48:32 -0700
+
maven-debian-helper (1.6.10) experimental; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index ce39ce9..f5ea27d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,9 @@ Homepage: http://wiki.debian.org/Java/MavenBuilder
Package: maven-debian-helper
Architecture: all
-Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.9), maven2 (>= 2.2.1-5),
+Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.9), maven (>= 3.0.5-1),
libmaven-clean-plugin-java,
- libmaven-compiler-plugin-2.5-java,
+ libmaven-compiler-plugin-java,
libmaven-jar-plugin-java,
libmaven-resources-plugin-java,
libmaven-site-plugin-java,
diff --git a/debian/install b/debian/install
index 6b81121..f96e9d3 100644
--- a/debian/install
+++ b/debian/install
@@ -1,7 +1,7 @@
bin/mh_* /usr/bin
bin/mvn-debian /usr/bin
-etc/*.conf /etc/maven2/
-etc/*.xml /etc/maven2/
+etc/*.conf /etc/maven/
+etc/*.xml /etc/maven/
share/cdbs/1/class/*.mk /usr/share/cdbs/1/class
share/maven-debian-helper/*.sh /usr/share/maven-debian-helper
usr/share/perl5
diff --git a/debian/maven.rules b/debian/maven.rules
index 1f9322e..5c2da0f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,3 @@
junit junit jar s/4\..*/4.x/
org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
+org.apache.maven maven-embedder * s/3\..*/3.x/
diff --git a/debian/rules b/debian/rules
index fe95391..480404c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ 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 classworlds maven-core maven-artifact maven-artifact-manager maven-model \
- maven-compat maven-plugin-api maven-project maven-scm-api velocity file-management plexus-utils \
+DEB_JARS := ant-junit junit commons-io plexus-classworlds maven-core maven-artifact maven-artifact-manager maven-model \
+ maven-embedder maven-plugin-api maven-scm-api velocity file-management plexus-utils \
plexus-container-default-alpha maven-repo-helper
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
diff --git a/etc/m2-debian-nodocs.conf b/etc/m2-debian-nodocs.conf
index 2c3362a..e695a14 100644
--- a/etc/m2-debian-nodocs.conf
+++ b/etc/m2-debian-nodocs.conf
@@ -1,6 +1,6 @@
main is org.debian.maven.Wrapper from debian
-set maven.home default /usr/share/maven2
+set maven.home default /usr/share/maven
[debian]
load /usr/share/java/maven-debian-helper.jar
diff --git a/etc/m2-debian.conf b/etc/m2-debian.conf
index f3192a1..d91016d 100644
--- a/etc/m2-debian.conf
+++ b/etc/m2-debian.conf
@@ -1,6 +1,6 @@
main is org.debian.maven.Wrapper from debian
-set maven.home default /usr/share/maven2
+set maven.home default /usr/share/maven
[debian]
load /usr/share/java/maven-debian-helper.jar
diff --git a/maven-build-nodocs/pom.xml b/maven-build-nodocs/pom.xml
index 02b0284..5d99440 100644
--- a/maven-build-nodocs/pom.xml
+++ b/maven-build-nodocs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>1.6.9</version>
+ <version>2.0.0</version>
</parent>
<artifactId>maven-build-nodocs</artifactId>
diff --git a/maven-debian-helper/pom.xml b/maven-debian-helper/pom.xml
index 13b1252..843f57d 100644
--- a/maven-debian-helper/pom.xml
+++ b/maven-debian-helper/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>1.6.9</version>
+ <version>2.0.0</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
@@ -14,8 +14,8 @@
<dependencies>
<dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java b/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java
index 4e7270a..ad444a8 100644
--- a/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java
+++ b/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java
@@ -21,8 +21,7 @@ import java.io.IOException;
import java.util.Enumeration;
import java.util.Properties;
-import org.apache.maven.cli.compat.CompatibleMain;
-import org.codehaus.classworlds.ClassWorld;
+import org.apache.maven.cli.MavenCli;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -83,10 +82,11 @@ public class Wrapper {
/**
* Wraps maven's main function
*/
- public static int main(String[] args, ClassWorld classWorld) throws IOException {
+ public static int main(String[] args) throws IOException {
Properties extraArguments = readProperties(EXTRA_PROPERTIES_PROPERTY);
String[] newArgs = updateCommandLine(extraArguments, args);
- return CompatibleMain.main(newArgs, classWorld);
+ MavenCli.main(newArgs);
+ return 0;
}
}
diff --git a/maven-packager-utils/pom.xml b/maven-packager-utils/pom.xml
index 8504411..6c606af 100644
--- a/maven-packager-utils/pom.xml
+++ b/maven-packager-utils/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>1.6.9</version>
+ <version>2.0.0</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
@@ -23,10 +23,6 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index de0ab30..8eef497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>1.6.9</version>
+ <version>2.0.0</version>
<packaging>pom</packaging>
<description>Helper tools for using Maven to build Debian packages</description>
@@ -23,17 +23,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.2.1</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>2.2.1</version>
+ <artifactId>maven-embedder</artifactId>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.8</version>
+ <version>2.0.5</version>
</dependency>
</dependencies>
@@ -47,22 +47,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.2.1</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.2.1</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.2.1</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -89,7 +84,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
diff --git a/share/cdbs/1/class/maven-vars.mk b/share/cdbs/1/class/maven-vars.mk
index 596fc05..022b625 100644
--- a/share/cdbs/1/class/maven-vars.mk
+++ b/share/cdbs/1/class/maven-vars.mk
@@ -33,10 +33,10 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.4)
# Maven home directory. Doesn't need to be changed except when using
# nonstandard Maven installations.
-MAVEN_HOME = /usr/share/maven2
+MAVEN_HOME = /usr/share/maven
MAVEN_DEBIAN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
-MAVEN_CLASSCONF = /etc/maven2/m2-debian.conf
+MAVEN_CLASSCONF = /etc/maven/m2-debian.conf
# The home directory of the Java Runtime Environment (JRE) or Java Development
# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
@@ -54,7 +54,7 @@ JAVACMD = $(JAVA_HOME)/bin/java
# end of the class path if it exists in the JDK's lib directory.
# You can override the complete class path using DEB_CLASSPATH.
DEB_JARS_BASE = /usr/share/java
-DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \
+DEB_CLASSPATH = $(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar:$(shell for jar in $(DEB_JARS); do \
if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
@@ -94,7 +94,7 @@ DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && ec
DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
$(JAVA_OPTS) -Dclassworlds.conf=$(MAVEN_CLASSCONF) \
org.codehaus.classworlds.Launcher \
- -s/etc/maven2/settings-debian.xml \
+ -s/etc/maven/settings-debian.xml \
-Dmaven.repo.local=$(DEB_MAVEN_REPO) \
$(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
diff --git a/share/cdbs/1/class/maven.mk b/share/cdbs/1/class/maven.mk
index a9e68b3..02af553 100644
--- a/share/cdbs/1/class/maven.mk
+++ b/share/cdbs/1/class/maven.mk
@@ -47,7 +47,7 @@ maven-sanity-check:
echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
exit 1; \
fi
- @if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \
+ @if ! test -r "$(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar"; then \
echo "You must specify a valid MAVEN_HOME directory!"; \
exit 1; \
fi
@@ -60,7 +60,7 @@ debian/maven.rules:
ifeq (, $(DEB_DOC_PACKAGE))
DEB_PATCHPOMS_ARGS += --build-no-docs
-debian/stamp-maven-build: override MAVEN_CLASSCONF = /etc/maven2/m2-debian-nodocs.conf
+debian/stamp-maven-build: override MAVEN_CLASSCONF = /etc/maven/m2-debian-nodocs.conf
endif
debian/stamp-poms-patched: debian/maven-repo
diff --git a/share/maven-debian-helper/copy-repo.sh b/share/maven-debian-helper/copy-repo.sh
index d520a45..3e2e0cd 100755
--- a/share/maven-debian-helper/copy-repo.sh
+++ b/share/maven-debian-helper/copy-repo.sh
@@ -25,7 +25,7 @@ find_src_poms() {
list_fakes()
{
- CONFFILES="/etc/maven2/fake-poms.conf"
+ CONFFILES="/etc/maven/fake-poms.conf"
if [ -r debian/fake-poms.conf ]
then
CONFFILES="$CONFFILES debian/fake-poms.conf"
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 19d63f1..799d2dc 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -26,12 +26,12 @@ sub new {
my @packages = @{$dh{DOPACKAGES}};
$this->{package} = shift @packages;
$this->{doc_package} = (grep /-doc$/, @packages)[0];
- my $classconf = '/etc/maven2/m2-debian.conf';
+ my $classconf = '/etc/maven/m2-debian.conf';
if (!$this->{doc_package}) {
- $classconf = '/etc/maven2/m2-debian-nodocs.conf';
+ $classconf = '/etc/maven/m2-debian-nodocs.conf';
}
- my @classpath = ('/usr/share/maven2/boot/classworlds.jar');
+ my @classpath = ('/usr/share/maven/boot/classworlds-2.x.jar');
if (-e "$java_home/lib/tools.jar") {
push(@classpath, "$java_home/lib/tools.jar");
}
@@ -45,7 +45,7 @@ sub new {
@{$this->{maven_cmd}} = ($java_home . '/bin/java',
@jvmopts,
"org.codehaus.classworlds.Launcher",
- "-s/etc/maven2/settings-debian.xml",
+ "-s/etc/maven/settings-debian.xml",
"-Ddebian.dir=$this->{cwd}/debian",
"-Dmaven.repo.local=$this->{cwd}/debian/maven-repo");
return $this;
--
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