This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch topic-maven3 in repository maven-debian-helper.
commit 279021cdf7a16d046b69e9f281ef8f4ab22e4a5d Author: Jakub Adam <[email protected]> Date: Fri May 3 15:47:47 2013 +0200 Add support for maven3 buildsystem --- debian/control | 2 +- debian/install | 3 +-- etc/{ => maven}/fake-poms.conf | 0 etc/maven/m2-debian-nodocs.conf | 9 +++++++++ etc/maven/m2-debian.conf | 8 ++++++++ etc/{ => maven}/settings-debian.xml | 0 etc/maven2/fake-poms.conf | 1 + etc/{ => maven2}/m2-debian-nodocs.conf | 0 etc/{ => maven2}/m2-debian.conf | 0 etc/maven2/settings-debian.xml | 1 + .../src/main/java/org/debian/maven/Wrapper.java | 4 ++-- 11 files changed, 23 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 61fce72..6b28af2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Homepage: http://wiki.debian.org/Java/MavenBuilder Package: maven-debian-helper Architecture: all -Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.3), maven2 (>= 2.2.1-5), +Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.3), maven2 (>= 2.2.1-5) | maven, libmaven-clean-plugin-java, libmaven-resources-plugin-java, libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java, libsurefire-java, velocity, libplexus-velocity-java diff --git a/debian/install b/debian/install index 6b81121..f31de20 100644 --- a/debian/install +++ b/debian/install @@ -1,7 +1,6 @@ bin/mh_* /usr/bin bin/mvn-debian /usr/bin -etc/*.conf /etc/maven2/ -etc/*.xml /etc/maven2/ +etc/* /etc 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/etc/fake-poms.conf b/etc/maven/fake-poms.conf similarity index 100% rename from etc/fake-poms.conf rename to etc/maven/fake-poms.conf diff --git a/etc/maven/m2-debian-nodocs.conf b/etc/maven/m2-debian-nodocs.conf new file mode 100644 index 0000000..92cbe58 --- /dev/null +++ b/etc/maven/m2-debian-nodocs.conf @@ -0,0 +1,9 @@ +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-build-nodocs.jar +optionally ${maven.home}/lib/ext/*.jar +load ${maven.home}/lib/*.jar diff --git a/etc/maven/m2-debian.conf b/etc/maven/m2-debian.conf new file mode 100644 index 0000000..c790246 --- /dev/null +++ b/etc/maven/m2-debian.conf @@ -0,0 +1,8 @@ +main is org.debian.maven.Wrapper from debian + +set maven.home default /usr/share/maven + +[debian] +load /usr/share/java/maven-debian-helper.jar +optionally ${maven.home}/lib/ext/*.jar +load ${maven.home}/lib/*.jar diff --git a/etc/settings-debian.xml b/etc/maven/settings-debian.xml similarity index 100% rename from etc/settings-debian.xml rename to etc/maven/settings-debian.xml diff --git a/etc/maven2/fake-poms.conf b/etc/maven2/fake-poms.conf new file mode 120000 index 0000000..084019b --- /dev/null +++ b/etc/maven2/fake-poms.conf @@ -0,0 +1 @@ +../maven/fake-poms.conf \ No newline at end of file diff --git a/etc/m2-debian-nodocs.conf b/etc/maven2/m2-debian-nodocs.conf similarity index 100% rename from etc/m2-debian-nodocs.conf rename to etc/maven2/m2-debian-nodocs.conf diff --git a/etc/m2-debian.conf b/etc/maven2/m2-debian.conf similarity index 100% rename from etc/m2-debian.conf rename to etc/maven2/m2-debian.conf diff --git a/etc/maven2/settings-debian.xml b/etc/maven2/settings-debian.xml new file mode 120000 index 0000000..3eb6ad3 --- /dev/null +++ b/etc/maven2/settings-debian.xml @@ -0,0 +1 @@ +../maven/settings-debian.xml \ No newline at end of file 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 a12a56a..cc6cfbe 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,7 +21,7 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Properties; -import org.apache.maven.cli.compat.CompatibleMain; +import org.apache.maven.cli.MavenCli; import org.codehaus.classworlds.ClassWorld; /** @@ -89,6 +89,6 @@ public class Wrapper { updateCommandLine(args); - return CompatibleMain.main(newArgs, classWorld); + return MavenCli.main(newArgs, classWorld); } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
