This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-sec-dispatcher.
commit cc034530f6e5d406ecc848d1b77bcdc7360d2ea6 Author: Torsten Werner <[email protected]> Date: Sun Aug 28 20:42:35 2011 +0000 The latest upstream release is 1.4. * Use Maven to build the package. * Add a documentation package. --- debian/README.source | 9 +++++++ debian/build.properties | 10 -------- debian/build.xml | 28 --------------------- debian/changelog | 6 +++-- debian/components.xml | 22 ---------------- debian/control | 29 ++++++++++++++++------ debian/copyright | 5 ++-- .../libplexus-sec-dispatcher-java-doc.doc-base.api | 10 ++++++++ debian/libplexus-sec-dispatcher-java-doc.install | 2 ++ debian/libplexus-sec-dispatcher-java.poms | 27 +++++++++++++++++++- debian/maven.cleanIgnoreRules | 17 +++++++++++++ debian/maven.ignoreRules | 16 ++++++++++++ debian/maven.properties | 4 +++ debian/maven.publishedRules | 19 ++++++++++++++ debian/maven.rules | 23 +++++++++++++++-- debian/orig-tar.sh | 17 ------------- debian/rules | 22 ++-------------- debian/watch | 2 +- 18 files changed, 156 insertions(+), 112 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..2348dc4 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about plexus-sec-dispatcher +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index ca14dbb..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -javadoc.dir=build/api -maven.test.skip=true -# need to specify the classpath here otherwise there will be -# a conflict with the modello task, because of plexus-container-default-alpha -classpath.compile = \ - /usr/share/java/classworlds:\ - /usr/share/java/plexus-utils.jar:\ - /usr/share/java/plexus-cipher.jar:\ - /usr/share/java/plexus-container-default-alpha.jar - diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 68b59ec..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <property file="debian/build.properties"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> - - <target name="clean"> - <ant target="clean" antfile="${maven.build.xml}" dir=""/> - </target> - - <target name="generate-sources"> - <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/> - <modello model="src/main/mdo/settings-security.mdo" plugin="java" output="build/generated-sources" version="1.0.0"/> - <modello model="src/main/mdo/settings-security.mdo" plugin="xpp3-reader" output="build/generated-sources" version="1.0.0"/> - <modello model="src/main/mdo/settings-security.mdo" plugin="xpp3-writer" output="build/generated-sources" version="1.0.0"/> - </target> - - <target name="package" depends="generate-sources"> - <ant target="package" antfile="${maven.build.xml}" dir="" /> - </target> - - <target name="javadoc"> - <ant target="javadoc" antfile="${maven.build.xml}" dir=""/> - </target> -</project> - diff --git a/debian/changelog b/debian/changelog index c01595e..6c076af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ plexus-sec-dispatcher (1.3.1-5) unstable; urgency=low - UNRELEASED * Team upload. * Update debian/watch to point to github but github does not have any tags. + The latest upstream release is 1.4. * Switch to source format 3.0. * Switch to debhelper level 7. * Update Standards-Version: 3.9.1. + * Use Maven to build the package. + * Add a documentation package. - -- Torsten Werner <[email protected]> Sun, 28 Aug 2011 18:27:09 +0200 + -- Torsten Werner <[email protected]> Sun, 28 Aug 2011 22:41:31 +0200 plexus-sec-dispatcher (1.3.1-4) unstable; urgency=low diff --git a/debian/components.xml b/debian/components.xml deleted file mode 100644 index dbd98a8..0000000 --- a/debian/components.xml +++ /dev/null @@ -1,22 +0,0 @@ -<component-set> - <components> - <component> - <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role> - <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation> - <description></description> - <requirements> - <requirement> - <role>org.sonatype.plexus.components.cipher.PlexusCipher</role> - <field-name>_cipher</field-name> - </requirement> - <requirement> - <role>org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor</role> - <field-name>_decryptors</field-name> - </requirement> - </requirements> - <configuration> - <_configuration-file>~/.settings-security.xml</_configuration-file> - </configuration> - </component> - </components> -</component-set> diff --git a/debian/control b/debian/control index 8fd2c63..2ab6fee 100644 --- a/debian/control +++ b/debian/control @@ -3,22 +3,37 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, - libmodello-java (>= 1.0.1), - libplexus-utils-java, libplexus-container-default-java (>= 1.0-alpha-9-stable-1-3), libplexus-cipher-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmodello-maven-plugin-java, libplexus-maven-plugin-java, junit (>= 3.8.2), + libplexus-cipher-java, libplexus-container-default-java, libplexus-utils-java, + default-jdk-doc, libplexus-container-default-java-doc, libplexus-utils-java-doc, + libmaven-javadoc-plugin-java Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-sec-dispatcher Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-sec-dispatcher/ -Homepage: http://www.sonatype.org/ +Homepage: https://github.com/sonatype/plexus-sec-dispatcher Package: libplexus-sec-dispatcher-java Architecture: all -Depends: ${misc:Depends}, libplexus-utils-java, - libplexus-container-default-java (>= 1.0-alpha-9-stable-1-3), libplexus-cipher-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libplexus-sec-dispatcher-java-doc Description: Plexus Security Dispatcher Component used by Maven The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications can utilise component-oriented programming to build modular, reusable components that can easily be assembled and reused. +Package: libplexus-sec-dispatcher-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libplexus-sec-dispatcher-java +Description: Documentation for Plexus Security Dispatcher Component + The Plexus project provides a full software stack for creating and + executing software projects. Based on the Plexus container, the applications + can utilise component-oriented programming to build modular, reusable + components that can easily be assembled and reused. + . + This package contains the API documentation of libplexus-sec-dispatcher-java. diff --git a/debian/copyright b/debian/copyright index 0b43353..933d4ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format-Specification: http://dep.debian.net/deps/dep5/ Name: Plexus Security Dispatcher Component Maintainer: Sonatype -Source: http://www.sonatype.org/ +Source: https://github.com/sonatype/plexus-sec-dispatcher Files: * Copyright: 2008, Sonatype Inc. @@ -9,8 +9,9 @@ License: Apache-2.0 Files: debian/* Copyright: 2009, Ludovic Claude <[email protected]> + 2011, Torsten Werner <[email protected]> License: Apache-2.0 License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the - Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/libplexus-sec-dispatcher-java-doc.doc-base.api b/debian/libplexus-sec-dispatcher-java-doc.doc-base.api new file mode 100644 index 0000000..7c0a560 --- /dev/null +++ b/debian/libplexus-sec-dispatcher-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libplexus-sec-dispatcher-java +Title: API Javadoc for Plexus Security Dispatcher Component +Author: Plexus Security Dispatcher Component developers +Abstract: This is the API Javadoc provided for the + libplexus-sec-dispatcher-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libplexus-sec-dispatcher-java/api/index.html +Files: /usr/share/doc/libplexus-sec-dispatcher-java/api/* diff --git a/debian/libplexus-sec-dispatcher-java-doc.install b/debian/libplexus-sec-dispatcher-java-doc.install new file mode 100644 index 0000000..0e470ae --- /dev/null +++ b/debian/libplexus-sec-dispatcher-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libplexus-sec-dispatcher-java/api + diff --git a/debian/libplexus-sec-dispatcher-java.poms b/debian/libplexus-sec-dispatcher-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libplexus-sec-dispatcher-java.poms +++ b/debian/libplexus-sec-dispatcher-java.poms @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --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 +# --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. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --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. +# +pom.xml --no-parent --has-package-version diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..0088a40 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,16 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..7c29bd7 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.rules b/debian/maven.rules index d524174..3a57d54 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,21 @@ -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/ -junit junit jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +junit junit jar s/3\..*/3.x/ * * +org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * +org.sonatype.plexus plexus-sec-dispatcher jar s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index 5d14b0d..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -e - -VERSION=$2 -TAR=../plexus-sec-dispatcher_$VERSION.orig.tar.gz -DIR=plexus-sec-dispatcher-$VERSION -TAG=$(echo "plexus-sec-dispatcher-$VERSION" | sed 's,~\(alpha\|beta\),-\1-,') - -svn export http://svn.sonatype.org/spice/tags/$TAG/ $DIR -tar -c -z -f $TAR $DIR -rm -rf $DIR ../$TAG - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" -fi diff --git a/debian/rules b/debian/rules index 1015813..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps -DEB_ANT_BUILD_TARGET := package -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -makebuilddir/lib$(PACKAGE)-java:: - install -d src/main/resources/META-INF/plexus - install -m644 debian/components.xml src/main/resources/META-INF/plexus/ - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - diff --git a/debian/watch b/debian/watch index 56fba9d..4ca6017 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,5 @@ version=3 opts="uversionmangle=s{-(alpha|beta)-}{~$1}" \ http://githubredir.debian.net/github/sonatype/plexus-sec-dispatcher \ - debian + .*/(.*).tar.gz debian -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-sec-dispatcher.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
