[pkg-java] r14532 - trunk/plexus-sec-dispatcher/debian
Torsten Werner
twerner at alioth.debian.org
Sun Aug 28 20:42:35 UTC 2011
Author: twerner
Date: 2011-08-28 20:42:35 +0000 (Sun, 28 Aug 2011)
New Revision: 14532
Added:
trunk/plexus-sec-dispatcher/debian/README.source
trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.doc-base.api
trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.install
trunk/plexus-sec-dispatcher/debian/maven.cleanIgnoreRules
trunk/plexus-sec-dispatcher/debian/maven.ignoreRules
trunk/plexus-sec-dispatcher/debian/maven.properties
trunk/plexus-sec-dispatcher/debian/maven.publishedRules
Removed:
trunk/plexus-sec-dispatcher/debian/build.properties
trunk/plexus-sec-dispatcher/debian/build.xml
trunk/plexus-sec-dispatcher/debian/components.xml
trunk/plexus-sec-dispatcher/debian/orig-tar.sh
Modified:
trunk/plexus-sec-dispatcher/debian/changelog
trunk/plexus-sec-dispatcher/debian/control
trunk/plexus-sec-dispatcher/debian/copyright
trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java.poms
trunk/plexus-sec-dispatcher/debian/maven.rules
trunk/plexus-sec-dispatcher/debian/rules
trunk/plexus-sec-dispatcher/debian/watch
Log:
The latest upstream release is 1.4.
* Use Maven to build the package.
* Add a documentation package.
Added: trunk/plexus-sec-dispatcher/debian/README.source
===================================================================
--- trunk/plexus-sec-dispatcher/debian/README.source (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/README.source 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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.
Deleted: trunk/plexus-sec-dispatcher/debian/build.properties
===================================================================
--- trunk/plexus-sec-dispatcher/debian/build.properties 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/build.properties 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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
-
Deleted: trunk/plexus-sec-dispatcher/debian/build.xml
===================================================================
--- trunk/plexus-sec-dispatcher/debian/build.xml 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/build.xml 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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>
-
Modified: trunk/plexus-sec-dispatcher/debian/changelog
===================================================================
--- trunk/plexus-sec-dispatcher/debian/changelog 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/changelog 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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 <twerner at debian.org> Sun, 28 Aug 2011 18:27:09 +0200
+ -- Torsten Werner <twerner at debian.org> Sun, 28 Aug 2011 22:41:31 +0200
plexus-sec-dispatcher (1.3.1-4) unstable; urgency=low
Deleted: trunk/plexus-sec-dispatcher/debian/components.xml
===================================================================
--- trunk/plexus-sec-dispatcher/debian/components.xml 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/components.xml 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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>
Modified: trunk/plexus-sec-dispatcher/debian/control
===================================================================
--- trunk/plexus-sec-dispatcher/debian/control 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/control 2011-08-28 20:42:35 UTC (rev 14532)
@@ -3,22 +3,37 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-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.
Modified: trunk/plexus-sec-dispatcher/debian/copyright
===================================================================
--- trunk/plexus-sec-dispatcher/debian/copyright 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/copyright 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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 @@
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-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.doc-base.api
===================================================================
--- trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.doc-base.api (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.doc-base.api 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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/*
Added: trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.install
===================================================================
--- trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.install (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java-doc.install 2011-08-28 20:42:35 UTC (rev 14532)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-sec-dispatcher-java/api
+
Modified: trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java.poms
===================================================================
--- trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java.poms 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/libplexus-sec-dispatcher-java.poms 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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-sec-dispatcher/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/plexus-sec-dispatcher/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/maven.cleanIgnoreRules 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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-sec-dispatcher/debian/maven.ignoreRules
===================================================================
--- trunk/plexus-sec-dispatcher/debian/maven.ignoreRules (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/maven.ignoreRules 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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-sec-dispatcher/debian/maven.properties
===================================================================
--- trunk/plexus-sec-dispatcher/debian/maven.properties (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/maven.properties 2011-08-28 20:42:35 UTC (rev 14532)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/plexus-sec-dispatcher/debian/maven.publishedRules
===================================================================
--- trunk/plexus-sec-dispatcher/debian/maven.publishedRules (rev 0)
+++ trunk/plexus-sec-dispatcher/debian/maven.publishedRules 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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-sec-dispatcher/debian/maven.rules
===================================================================
--- trunk/plexus-sec-dispatcher/debian/maven.rules 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/maven.rules 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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/ * *
Deleted: trunk/plexus-sec-dispatcher/debian/orig-tar.sh
===================================================================
--- trunk/plexus-sec-dispatcher/debian/orig-tar.sh 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/orig-tar.sh 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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
Modified: trunk/plexus-sec-dispatcher/debian/rules
===================================================================
--- trunk/plexus-sec-dispatcher/debian/rules 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/rules 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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
-
Modified: trunk/plexus-sec-dispatcher/debian/watch
===================================================================
--- trunk/plexus-sec-dispatcher/debian/watch 2011-08-28 20:15:28 UTC (rev 14531)
+++ trunk/plexus-sec-dispatcher/debian/watch 2011-08-28 20:42:35 UTC (rev 14532)
@@ -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
More information about the pkg-java-commits
mailing list