This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch eclipse-aether in repository eclipse-aether.
commit e4369b8ef341c64cedff6eb56fdd75b1c60e4d86 Author: Damien Raude-Morvan <[email protected]> Date: Sun Dec 4 13:38:52 2011 +0100 Align versions with maven 3.x --- debian/README.source | 2 +- debian/control | 13 ++++++------- debian/libaether-java.poms | 12 +++++++----- debian/maven.ignoreRules | 11 +++++------ debian/maven.properties | 3 --- debian/maven.rules | 10 +++++----- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/debian/README.source b/debian/README.source index 9f7fe59..02df8b1 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,4 +1,4 @@ -Information about sonatype-aether +Information about aether ------------------------------ This package was debianized using the mh_make command diff --git a/debian/control b/debian/control index 40e6cc7..110ba85 100644 --- a/debian/control +++ b/debian/control @@ -8,13 +8,12 @@ Build-Depends-Indep: default-jdk-doc, libasync-http-client-java, libasync-http-client-java-doc, libmaven-javadoc-plugin-java, - libplexus-classworlds-java, - libplexus-classworlds-java-doc, - libplexus-component-metadata-java, - libplexus-containers-java, - libplexus-containers-java-doc, - libplexus-utils-java, - libplexus-utils-java-doc, + libplexus-classworlds2-java, + libplexus-classworlds2-java-doc, + libplexus-containers1.5-java, + libplexus-containers1.5-java-doc, + libplexus-utils2-java, + libplexus-utils2-java-doc, libslf4j-java, libwagon-java, libwagon-java-doc diff --git a/debian/libaether-java.poms b/debian/libaether-java.poms index 43f0368..cfb230a 100644 --- a/debian/libaether-java.poms +++ b/debian/libaether-java.poms @@ -3,8 +3,8 @@ # <path to pom file> [option]* # where option can be: # --ignore: ignore this POM and its artifact if any -# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created -# temporarily for certain artifacts such as Javadoc jars. +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the <parent> tag from the POM # --package=<package>: an alternative package to use when installing this POM # and its artifact @@ -13,15 +13,17 @@ # --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=<path>: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install +# it will be installed when using the command mh_install. [mh_install] # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=<name>: name to use when installing the library in /usr/share/java # --usj-version=<version>: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=<path>: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # pom.xml --no-parent --has-package-version aether-api/pom.xml --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 317c820..f0be19a 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -14,11 +14,10 @@ # from the POM # junit junit jar s/3\\..*/3.x/ -org.codehaus.mojo clirr-maven-plugin * * * * -org.codehaus.mojo animal-sniffer-maven-plugin * * * * -org.sonatype.http-testing-harness junit-runner * * * * -org.sonatype.http-testing-harness server-provider * * - +junit junit * * * * org.apache.maven.wagon wagon-http-lightweight * * * * +org.codehaus.mojo animal-sniffer-maven-plugin * * * * +org.codehaus.mojo clirr-maven-plugin * * * * org.mortbay.jetty jetty * * * * -org.sonatype.sisu sisu-inject-plexus * * * * +org.sonatype.http-testing-harness junit-runner * * * * +org.sonatype.http-testing-harness server-provider * * * * diff --git a/debian/maven.properties b/debian/maven.properties index 78f1358..e593715 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -3,6 +3,3 @@ # maven.test.skip=true maven.test.skip=true - -maven.compiler.source=1.5 -maven.compiler.target=1.5 diff --git a/debian/maven.rules b/debian/maven.rules index 3715053..3af6f5b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -16,11 +16,11 @@ # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ -com.ning async-http-client jar s/.*/debian/ * * -junit junit jar s/.*/4.x/ * * -junit junit jar s/4\..*/4.x/ * * -org.apache.maven.wagon wagon-provider-api jar s/.*/debian/ * * -org.codehaus.plexus plexus-classworlds jar s/.*/debian/ * * +org.codehaus.plexus plexus-classworlds jar s/2\..*/2.x/ * * +org.codehaus.plexus plexus-component-annotations jar s/.*/1.5.x/ * * +org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.x/ * * +org.codehaus.plexus plexus-utils jar s/2\..*/2.x/ * * + org.sonatype.aether aether-api jar s/.*/debian/ * * org.sonatype.aether aether-connector-asynchttpclient jar s/.*/debian/ * * org.sonatype.aether aether-connector-file jar s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-aether.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
