This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-ant-helper.
commit d8f71ad6b79c7ae093f17ff562f4e1019e020616 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 17:03:45 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 2 +- maven-build.xml | 80 ++++++++++++++++++++++++++++++++------------------------ 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9db8404..9b260bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ maven-ant-helper (7.12) UNRELEASED; urgency=medium + * Depend on libmaven3-core-java instead of libmaven2-core-java * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 076be4f..7f799b0 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Depends: ant, ${misc:Depends} Suggests: default-jdk-doc, libmaven-plugin-tools-java, - libmaven2-core-java, + libmaven3-core-java, libmodello-java (>= 1.0), libplexus-component-metadata-java Description: helper scripts for building Maven components with ant diff --git a/maven-build.xml b/maven-build.xml index 0dd2484..7dddafe 100644 --- a/maven-build.xml +++ b/maven-build.xml @@ -49,7 +49,7 @@ then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath for this functionality to work. - When using the Maven target, you need to add libmaven2-core-java to Build-Depends, as well as the + When using the Maven target, you need to add libmaven3-core-java to Build-Depends, as well as the library containing the Maven plugin to execute (libmaven-plugin-tools-java for plugin:generate, libplexus-component-metadata-java for org.codehaus.plexus:plexus-component-metadata:generate-metadata) --> @@ -98,39 +98,49 @@ <path id="maven.classpath"> <pathelement location="/usr/share/maven-ant-helper/bootstrap"/> - <fileset dir="/usr/share/maven-repo"> - <include name="classworlds/classworlds/debian/classworlds-debian.jar"/> - <include name="com/jcraft/jsch/debian/jsch-debian.jar"/> - <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/> - <include name="junit/junit/debian/junit-debian.jar"/> - <include name="xml-apis/xml-apis/debian/xml-apis-debian.jar"/> - <include name="org/apache/maven/doxia/doxia-logging-api/debian/doxia-logging-api-debian.jar"/> - <include name="org/apache/maven/doxia/doxia-sink-api/debian/doxia-sink-api-debian.jar"/> - <include name="org/apache/maven/maven-artifact/debian/maven-artifact-debian.jar"/> - <include name="org/apache/maven/maven-artifact-manager/debian/maven-artifact-manager-debian.jar"/> - <include name="org/apache/maven/maven-core/debian/maven-core-debian.jar"/> - <include name="org/apache/maven/maven-error-diagnostics/debian/maven-error-diagnostics-debian.jar"/> - <include name="org/apache/maven/maven-model/debian/maven-model-debian.jar"/> - <include name="org/apache/maven/maven-monitor/debian/maven-monitor-debian.jar"/> - <include name="org/apache/maven/maven-plugin-api/debian/maven-plugin-api-debian.jar"/> - <include name="org/apache/maven/maven-plugin-descriptor/debian/maven-plugin-descriptor-debian.jar"/> - <include name="org/apache/maven/maven-plugin-parameter-documenter/debian/maven-plugin-parameter-documenter-debian.jar"/> - <include name="org/apache/maven/maven-plugin-registry/debian/maven-plugin-registry-debian.jar"/> - <include name="org/apache/maven/maven-profile/debian/maven-profile-debian.jar"/> - <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/> - <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/> - <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/> - <include name="org/apache/maven/maven-toolchain/debian/maven-toolchain-debian.jar"/> - <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/> - <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/> - <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/> - <include name="org/apache/maven/wagon/wagon-ssh/debian/wagon-ssh-debian.jar"/> - <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar"/> - <include name="org/codehaus/plexus/plexus-interactivity-api/debian/plexus-interactivity-api-debian.jar"/> - <include name="org/codehaus/plexus/plexus-interpolation/debian/plexus-interpolation-debian.jar"/> - <include name="org/codehaus/plexus/plexus-utils/debian/plexus-utils-debian.jar"/> - <include name="org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar"/> - <include name="org/sonatype/plexus/plexus-sec-dispatcher/debian/plexus-sec-dispatcher-debian.jar"/> + <fileset dir="/usr/share/java"> + <include name="plexus-classworlds2.jar"/> + <include name="aopalliance.jar"/> + <include name="cdi-api.jar"/> + <include name="commons-cli.jar"/> + <include name="commons-io.jar"/> + <include name="commons-lang3.jar"/> + <include name="guava.jar"/> + <include name="guice.jar"/> + <include name="jansi.jar"/> + <include name="atinject-jsr330-api-1.0.jar"/> + <include name="jcl-over-slf4j.jar"/> + <include name="maven3-artifact.jar"/> + <include name="maven3-builder-support.jar"/> + <include name="maven3-compat.jar"/> + <include name="maven3-core.jar"/> + <include name="maven3-embedder.jar"/> + <include name="maven3-model.jar"/> + <include name="maven3-model-builder.jar"/> + <include name="maven3-plugin-api.jar"/> + <include name="maven3-repository-metadata.jar"/> + <include name="maven-resolver-api.jar"/> + <include name="maven-resolver-connector-basic.jar"/> + <include name="maven-resolver-impl.jar"/> + <include name="maven3-resolver-provider.jar"/> + <include name="maven-resolver-spi.jar"/> + <include name="maven-resolver-transport-wagon.jar"/> + <include name="maven-resolver-util.jar"/> + <include name="maven3-settings.jar"/> + <include name="maven3-settings-builder.jar"/> + <include name="maven-shared-utils.jar"/> + <include name="maven3-slf4j-provider.jar"/> + <include name="plexus-cipher.jar"/> + <include name="plexus-component-annotations-1.5.jar"/> + <include name="plexus-interpolation.jar"/> + <include name="plexus-sec-dispatcher.jar"/> + <include name="plexus-utils2.jar"/> + <include name="sisu-inject.jar"/> + <include name="sisu-plexus.jar"/> + <include name="slf4j-api.jar"/> + <include name="wagon-file-2.x.jar"/> + <include name="wagon-http-shaded-2.x.jar"/> + <include name="wagon-provider-api-2.x.jar"/> </fileset> </path> @@ -267,6 +277,7 @@ <attribute name="target"/> <sequential> <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true"> + <jvmarg value="-Dmaven.multiModuleProjectDirectory=."/> <jvmarg value="-Xmx256M"/> <classpath refid="maven.classpath"/> <arg value="-Dmaven.compiler.source=${build.javaVersion}"/> @@ -295,6 +306,7 @@ <before-maven/> <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true"> + <jvmarg value="-Dmaven.multiModuleProjectDirectory=."/> <jvmarg value="-Xmx256M"/> <classpath refid="maven.classpath"/> <arg value="-Dmaven.compiler.source=${build.javaVersion}"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-ant-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
