[pkg-java] r14485 - trunk/plexus-cipher/debian
Torsten Werner
twerner at alioth.debian.org
Thu Aug 25 13:29:17 UTC 2011
Author: twerner
Date: 2011-08-25 13:29:17 +0000 (Thu, 25 Aug 2011)
New Revision: 14485
Added:
trunk/plexus-cipher/debian/README.source
trunk/plexus-cipher/debian/libplexus-cipher-java-doc.doc-base.api
trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
trunk/plexus-cipher/debian/maven.cleanIgnoreRules
trunk/plexus-cipher/debian/maven.ignoreRules
trunk/plexus-cipher/debian/maven.properties
trunk/plexus-cipher/debian/maven.publishedRules
Removed:
trunk/plexus-cipher/debian/build.properties
trunk/plexus-cipher/debian/components.xml
trunk/plexus-cipher/debian/orig-tar.sh
Modified:
trunk/plexus-cipher/debian/changelog
trunk/plexus-cipher/debian/control
trunk/plexus-cipher/debian/copyright
trunk/plexus-cipher/debian/libplexus-cipher-java.poms
trunk/plexus-cipher/debian/maven.rules
trunk/plexus-cipher/debian/rules
Log:
* Use Maven to build package.
* Add a documentation package.
Added: trunk/plexus-cipher/debian/README.source
===================================================================
--- trunk/plexus-cipher/debian/README.source (rev 0)
+++ trunk/plexus-cipher/debian/README.source 2011-08-25 13:29:17 UTC (rev 14485)
@@ -0,0 +1,9 @@
+Information about plexus-cipher
+------------------------------
+
+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.
Deleted: trunk/plexus-cipher/debian/build.properties
===================================================================
--- trunk/plexus-cipher/debian/build.properties 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/build.properties 2011-08-25 13:29:17 UTC (rev 14485)
@@ -1,2 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
Modified: trunk/plexus-cipher/debian/changelog
===================================================================
--- trunk/plexus-cipher/debian/changelog 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/changelog 2011-08-25 13:29:17 UTC (rev 14485)
@@ -6,8 +6,10 @@
* Update Homepage.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.
+ * Use Maven to build package.
+ * Add a documentation package.
- -- Torsten Werner <twerner at debian.org> Thu, 25 Aug 2011 15:17:45 +0200
+ -- Torsten Werner <twerner at debian.org> Thu, 25 Aug 2011 15:24:27 +0200
plexus-cipher (1.5-1) unstable; urgency=low
Deleted: trunk/plexus-cipher/debian/components.xml
===================================================================
--- trunk/plexus-cipher/debian/components.xml 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/components.xml 2011-08-25 13:29:17 UTC (rev 14485)
@@ -1,9 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
- <implementation>org.sonatype.plexus.components.cipher.DefaultPlexusCipher</implementation>
- <description></description>
- </component>
- </components>
-</component-set>
Modified: trunk/plexus-cipher/debian/control
===================================================================
--- trunk/plexus-cipher/debian/control 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/control 2011-08-25 13:29:17 UTC (rev 14485)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-ant-helper (>> 4), maven-repo-helper, ant, ant-optional,
- libplexus-container-default-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libplexus-maven-plugin-java, junit, libplexus-container-default-java, default-jdk-doc,
+ libplexus-container-default-java-doc, libmaven-javadoc-plugin-java
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cipher
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-cipher/
@@ -13,7 +13,9 @@
Package: libplexus-cipher-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-container-default-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libplexus-cipher-java-doc
Description: Plexus Cipher 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
@@ -22,3 +24,16 @@
.
This package provides a cipher component for Plexus.
+Package: libplexus-cipher-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libplexus-cipher-java
+Description: Documentation for Plexus Cipher 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.
+ .
+ This package contains the API documentation of libplexus-cipher-java.
Modified: trunk/plexus-cipher/debian/copyright
===================================================================
--- trunk/plexus-cipher/debian/copyright 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/copyright 2011-08-25 13:29:17 UTC (rev 14485)
@@ -15,8 +15,9 @@
Files: debian/*
Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
+ 2011, Torsten Werner <twerner at debian.org>
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'.
Added: trunk/plexus-cipher/debian/libplexus-cipher-java-doc.doc-base.api
===================================================================
--- trunk/plexus-cipher/debian/libplexus-cipher-java-doc.doc-base.api (rev 0)
+++ trunk/plexus-cipher/debian/libplexus-cipher-java-doc.doc-base.api 2011-08-25 13:29:17 UTC (rev 14485)
@@ -0,0 +1,10 @@
+Document: libplexus-cipher-java
+Title: API Javadoc for Plexus Cipher: encryption/decryption Component
+Author: Plexus Cipher: encryption/decryption Component developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-cipher-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-cipher-java/api/index.html
+Files: /usr/share/doc/libplexus-cipher-java/api/*
Added: trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
===================================================================
--- trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install (rev 0)
+++ trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install 2011-08-25 13:29:17 UTC (rev 14485)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-cipher-java/api
+
Modified: trunk/plexus-cipher/debian/libplexus-cipher-java.poms
===================================================================
--- trunk/plexus-cipher/debian/libplexus-cipher-java.poms 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/libplexus-cipher-java.poms 2011-08-25 13:29:17 UTC (rev 14485)
@@ -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
Added: trunk/plexus-cipher/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/plexus-cipher/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/plexus-cipher/debian/maven.cleanIgnoreRules 2011-08-25 13:29:17 UTC (rev 14485)
@@ -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/
+
Added: trunk/plexus-cipher/debian/maven.ignoreRules
===================================================================
--- trunk/plexus-cipher/debian/maven.ignoreRules (rev 0)
+++ trunk/plexus-cipher/debian/maven.ignoreRules 2011-08-25 13:29:17 UTC (rev 14485)
@@ -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/
+
Added: trunk/plexus-cipher/debian/maven.properties
===================================================================
--- trunk/plexus-cipher/debian/maven.properties (rev 0)
+++ trunk/plexus-cipher/debian/maven.properties 2011-08-25 13:29:17 UTC (rev 14485)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/plexus-cipher/debian/maven.publishedRules
===================================================================
--- trunk/plexus-cipher/debian/maven.publishedRules (rev 0)
+++ trunk/plexus-cipher/debian/maven.publishedRules 2011-08-25 13:29:17 UTC (rev 14485)
@@ -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/
+
Modified: trunk/plexus-cipher/debian/maven.rules
===================================================================
--- trunk/plexus-cipher/debian/maven.rules 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/maven.rules 2011-08-25 13:29:17 UTC (rev 14485)
@@ -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-cipher jar s/.*/debian/ * *
Deleted: trunk/plexus-cipher/debian/orig-tar.sh
===================================================================
--- trunk/plexus-cipher/debian/orig-tar.sh 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/orig-tar.sh 2011-08-25 13:29:17 UTC (rev 14485)
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../plexus-cipher_$VERSION.orig.tar.gz
-DIR=plexus-cipher-$VERSION
-TAG=$(echo "plexus-cipher-$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
Modified: trunk/plexus-cipher/debian/rules
===================================================================
--- trunk/plexus-cipher/debian/rules 2011-08-25 13:21:40 UTC (rev 14484)
+++ trunk/plexus-cipher/debian/rules 2011-08-25 13:29:17 UTC (rev 14485)
@@ -1,28 +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 plexus-container-default-alpha
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS := build/api
+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
-
More information about the pkg-java-commits
mailing list