[maven-debian-helper] 18/21: Update Maven to version 3.3

[Emmanuel Bourg]

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 905a898222d665af1bee34a72c1ec92326741825
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 13 15:23:36 2015 +0100

    Update Maven to version 3.3
---
 debian/changelog                 | 2 +-
 debian/control                   | 2 +-
 etc/m2-debian.conf               | 5 +++--
 share/cdbs/1/class/maven-vars.mk | 4 +++-
 share/perl/maven.pm              | 6 ++++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e9e567..6f2f1b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 maven-debian-helper (2.0) UNRELEASED; urgency=medium
 
-  * Update Maven to version 3.0.5
+  * Update Maven to version 3.3
   * Update mojos to use annotations
   * Remove nodocs build due to Maven 3 update
 
diff --git a/debian/control b/debian/control
index e9baa5c..d3ad20a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Homepage: http://wiki.debian.org/Java/MavenBuilder
 
 Package: maven-debian-helper
 Architecture: all
-Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.9), maven (>= 3.0.5-1),
+Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.9), maven (>= 3.3),
          libmaven-clean-plugin-java,
          libmaven-compiler-plugin-java,
          libmaven-jar-plugin-java,
diff --git a/etc/m2-debian.conf b/etc/m2-debian.conf
index 127e3d6..c394d61 100644
--- a/etc/m2-debian.conf
+++ b/etc/m2-debian.conf
@@ -3,6 +3,7 @@ main is org.debian.maven.Wrapper from debian
 set maven.home default /usr/share/maven
 
 [debian]
-load /usr/share/java/maven-debian-helper.jar
+load       /usr/share/java/maven-debian-helper.jar
 optionally ${maven.home}/lib/ext/*.jar
-load ${maven.home}/lib/*.jar
+load       ${maven.home}/lib/*.jar
+load       ${maven.home}/conf/logging
diff --git a/share/cdbs/1/class/maven-vars.mk b/share/cdbs/1/class/maven-vars.mk
index f3cfb54..b2e1ca0 100644
--- a/share/cdbs/1/class/maven-vars.mk
+++ b/share/cdbs/1/class/maven-vars.mk
@@ -93,7 +93,9 @@ DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && ec
 # MAVEN_ARGS_<package> for each individual package.
 DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
 		 $(JAVA_OPTS) -Dclassworlds.conf=$(MAVEN_CLASSCONF) \
-		 org.codehaus.classworlds.Launcher \
+		 -Dmaven.home=/usr/share/maven \
+		 -Dmaven.multiModuleProjectDirectory=$(CURDIR) \
+		 org.codehaus.plexus.classworlds.launcher.Launcher \
 		 -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/perl/maven.pm b/share/perl/maven.pm
index 1c26ba3..41dc6e8 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -28,12 +28,14 @@ sub new {
 	$this->{doc_package} = (grep /-doc$/, @packages)[0];
 	my $classconf = '/etc/maven/m2-debian.conf';
 
-	my @classpath = ('/usr/share/maven/boot/classworlds-2.x.jar');
+	my @classpath = ('/usr/share/maven/boot/plexus-classworlds-2.x.jar');
 	if (-e "$java_home/lib/tools.jar") {
 		push(@classpath, "$java_home/lib/tools.jar");
 	}
 
 	my @jvmopts = ('-noverify', '-cp', join(':', at classpath),
+		"-Dmaven.home=/usr/share/maven",
+		"-Dmaven.multiModuleProjectDirectory=$this->{cwd}",
 		"-Dclassworlds.conf=$classconf");
 	if (-e "$this->{cwd}/debian/maven.properties") {
 		push (@jvmopts, "-Dproperties.file.manual=$this->{cwd}/debian/maven.properties");
@@ -41,7 +43,7 @@ sub new {
 
 	@{$this->{maven_cmd}} = ($java_home . '/bin/java',
 		@jvmopts,
-		"org.codehaus.classworlds.Launcher",
+		"org.codehaus.plexus.classworlds.launcher.Launcher",
 		"-s/etc/maven/settings-debian.xml",
 		"-Ddebian.dir=$this->{cwd}/debian",
 		"-Dmaven.repo.local=$this->{cwd}/debian/maven-repo");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git