[plexus-containers1.5] 05/14: Build with maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 12 17:47:58 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-containers1.5.
commit a367b59e9f7719c4f3a9ed8cafdb713350ad07c8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Feb 11 20:52:34 2016 +0100
Build with maven-debian-helper
---
debian/build.properties | 7 -
debian/build.xml | 62 ----
debian/changelog | 2 +-
debian/control | 10 +-
debian/libplexus-containers1.5-java-doc.install | 1 +
debian/libplexus-containers1.5-java.poms | 8 +-
debian/maven.ignoreRules | 5 +
debian/maven.properties | 5 +
debian/maven.rules | 2 -
debian/plexus-component-metadata_plugin.xml | 367 ------------------------
debian/rules | 34 +--
11 files changed, 23 insertions(+), 480 deletions(-)
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 19bf2e6..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-classpath.compile=${basedir}/plexus-component-annotations/target/plexus-component-annotations-${version}.jar:\
- ${basedir}/plexus-container-default/target/plexus-container-default-${version}.jar
-javadoc.dir=target/api
-maven.test.skip=true
-build.javaVersion=1.5
-build.directory=target
-keep-cleaned-pom=true
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 0a79701..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="plexus-containers" default="package" basedir="..">
-
- <property file="debian/build.properties"/>
- <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <macrodef name="cleanmodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="clean" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- </ant>
- </sequential>
- </macrodef>
-
- <macrodef name="packagemodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- </ant>
- </sequential>
- </macrodef>
-
- <target name="clean">
- <delete dir="build"/>
- <cleanmodule dir="plexus-container-default"/>
- <cleanmodule dir="plexus-component-annotations"/>
- <cleanmodule dir="plexus-component-metadata"/>
- <cleanmodule dir="plexus-component-javadoc"/>
- </target>
-
- <target name="package">
- <!-- Don't rely on maven-plugin-tools to generate the plugin.xml since
- this generates a circular dependency. maven-plugin-tools itself
- depends on plexus-containers.
-
- Instead we use a pregenerated plugin.xml and just copy it.
- -->
- <mkdir dir="plexus-component-metadata/target/classes/META-INF/maven" />
- <copy file="debian/plexus-component-metadata_plugin.xml" tofile="plexus-component-metadata/target/classes/META-INF/maven/plugin.xml" />
- <packagemodule dir=""/>
- <packagemodule dir="plexus-container-default"/>
- <packagemodule dir="plexus-component-annotations"/>
- <packagemodule dir="plexus-component-metadata"/>
- <packagemodule dir="plexus-component-javadoc"/>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}" locale="en" encoding="ISO-8859-1" additionalparam="-notimestamp">
- <packageset dir="plexus-container-default/src/main/java/"/>
- <packageset dir="plexus-component-annotations/src/main/java/"/>
- <packageset dir="plexus-component-metadata/src/main/java/"/>
- <packageset dir="plexus-component-javadoc/src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 12a8762..054a9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
plexus-containers1.5 (1.6-2) UNRELEASED; urgency=medium
* Team upload.
+ * Build with maven-debian-helper
* No longer build plexus-component-javadoc (never used)
- * Updated the plugin descriptor
* Updated Standards-Version to 3.9.7 (no changes)
-- Emmanuel Bourg <ebourg at apache.org> Mon, 18 Jan 2016 13:17:26 +0100
diff --git a/debian/control b/debian/control
index 533e02f..03ead6b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,20 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk
-Build-Depends-Indep: ant,
- ant-optional,
- junit4,
+Build-Depends: debhelper (>= 9), default-jdk
+Build-Depends-Indep: junit4,
libasm4-java,
libcommons-cli-java,
libguava-java,
libjdom1-java,
+ libmaven-javadoc-plugin-java,
libmaven2-core-java,
libplexus-classworlds2-java,
libplexus-cli-java,
libplexus-utils2-java,
libqdox-java,
libxbean-java,
- maven-ant-helper,
- maven-repo-helper
+ maven-debian-helper
Standards-Version: 3.9.7
Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-containers1.5.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-containers1.5.git
diff --git a/debian/libplexus-containers1.5-java-doc.install b/debian/libplexus-containers1.5-java-doc.install
new file mode 100644
index 0000000..a4950e1
--- /dev/null
+++ b/debian/libplexus-containers1.5-java-doc.install
@@ -0,0 +1 @@
+target/site/apidocs/* /usr/share/doc/libplexus-containers1.5-java/api/
diff --git a/debian/libplexus-containers1.5-java.poms b/debian/libplexus-containers1.5-java.poms
index dc84ab1..af5042f 100644
--- a/debian/libplexus-containers1.5-java.poms
+++ b/debian/libplexus-containers1.5-java.poms
@@ -26,7 +26,7 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
-plexus-component-annotations/pom.xml --has-package-version
-plexus-component-metadata/pom.xml --has-package-version
-plexus-component-javadoc/pom.xml --has-package-version
-plexus-container-default/pom.xml --has-package-version
+plexus-component-annotations/pom.xml --has-package-version --usj-name=plexus-component-annotations-1.5
+plexus-component-metadata/pom.xml --has-package-version --usj-name=plexus-component-metadata-1.5
+plexus-component-javadoc/pom.xml --ignore
+plexus-container-default/pom.xml --has-package-version --usj-name=plexus-container-default-1.5
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..111c56d
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,5 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
index 74a53d5..38e6e63 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,9 +22,7 @@ junit junit jar s/.*/4.x/ * *
s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
s/com.google.collections/com.google.guava/ s/google-collections/guava/ * s/.*/debian/ * *
-org.codehaus.modello modello-maven-plugin maven-plugin s/.*/1.4.x/ * *
org.codehaus.plexus plexus-classworlds jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-cli jar s/.*/debian/ * *
org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
org.codehaus.plexus plexus-component-annotations jar s/.*/1.5.5/ * *
diff --git a/debian/plexus-component-metadata_plugin.xml b/debian/plexus-component-metadata_plugin.xml
deleted file mode 100644
index 3e02ba1..0000000
--- a/debian/plexus-component-metadata_plugin.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
- <name>Plexus :: Component Metadata</name>
- <description>A Maven plugin to generate Plexus descriptors from source tags and class annotations.</description>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.6</version>
- <goalPrefix>plexus-component-metadata</goalPrefix>
- <isolatedRealm>false</isolatedRealm>
- <inheritedByDefault>true</inheritedByDefault>
- <mojos>
- <mojo>
- <goal>generate-metadata</goal>
- <description>Generates a Plexus <tt>components.xml</tt> component descriptor file from source (javadoc) or
-class annotations.</description>
- <requiresDependencyResolution>compile</requiresDependencyResolution>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <phase>process-classes</phase>
- <implementation>org.codehaus.plexus.maven.plugin.PlexusDescriptorMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <threadSafe>false</threadSafe>
- <parameters>
- <parameter>
- <name>generatedMetadata</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The output location for the generated descriptor.</description>
- </parameter>
- <parameter>
- <name>intermediaryMetadata</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The output location for the intermediary descriptor. This descriptors contains only the information extracted
-from the project's sources/classes.</description>
- </parameter>
- <parameter>
- <name>mavenProject</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description></description>
- </parameter>
- <parameter>
- <name>sourceEncoding</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The file encoding of the source files.</description>
- </parameter>
- <parameter>
- <name>staticMetadataDirectory</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The location of manually crafted component descriptors. The contents of the descriptor files in this directory is
-merged with the information extracted from the project's sources/classes.</description>
- </parameter>
- </parameters>
- <configuration>
- <generatedMetadata implementation="java.io.File" default-value="${project.build.outputDirectory}/META-INF/plexus/components.xml"/>
- <intermediaryMetadata implementation="java.io.File" default-value="${project.build.directory}/components.xml"/>
- <mavenProject implementation="org.apache.maven.project.MavenProject">${project}</mavenProject>
- <sourceEncoding implementation="java.lang.String" default-value="${project.build.sourceEncoding}"/>
- <staticMetadataDirectory implementation="java.io.File" default-value="${basedir}/src/main/resources/META-INF/plexus"/>
- </configuration>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.MavenProjectHelper</role>
- <field-name>mavenProjectHelper</field-name>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.metadata.MetadataGenerator</role>
- <field-name>metadataGenerator</field-name>
- </requirement>
- </requirements>
- </mojo>
- <mojo>
- <goal>merge-metadata</goal>
- <description>Merges a set of Plexus descriptors into one descriptor file.</description>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <phase>process-classes</phase>
- <implementation>org.codehaus.plexus.maven.plugin.PlexusMergeMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <threadSafe>false</threadSafe>
- <parameters>
- <parameter>
- <name>descriptors</name>
- <type>java.io.File[]</type>
- <required>false</required>
- <editable>true</editable>
- <description>The paths of the input descriptors to merge.</description>
- </parameter>
- <parameter>
- <name>output</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The destination for the merged descriptor.</description>
- </parameter>
- </parameters>
- <configuration>
- <output implementation="java.io.File" default-value="${project.build.outputDirectory}/META-INF/plexus/components.xml"/>
- </configuration>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.metadata.merge.Merger</role>
- <role-hint>componentsXml</role-hint>
- <field-name>merger</field-name>
- </requirement>
- </requirements>
- </mojo>
- <mojo>
- <goal>generate-test-metadata</goal>
- <description>Generates a Plexus <tt>components.xml</tt> component descriptor file from test source (javadoc)
-or test class annotations.</description>
- <requiresDependencyResolution>test</requiresDependencyResolution>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <phase>process-test-classes</phase>
- <implementation>org.codehaus.plexus.maven.plugin.PlexusTestDescriptorMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <threadSafe>false</threadSafe>
- <parameters>
- <parameter>
- <name>mavenProject</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description></description>
- </parameter>
- <parameter>
- <name>sourceEncoding</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The file encoding of the source files.</description>
- </parameter>
- <parameter>
- <name>testGeneratedMetadata</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The output location for the generated descriptor.</description>
- </parameter>
- <parameter>
- <name>testIntermediaryMetadata</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The output location for the intermediary descriptor. This descriptors contains only the information extracted
-from the project's sources/classes.</description>
- </parameter>
- <parameter>
- <name>testStaticMetadataDirectory</name>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The location of manually crafted component descriptors. The contents of the descriptor files in this directory is
-merged with the information extracted from the project's sources/classes.</description>
- </parameter>
- </parameters>
- <configuration>
- <mavenProject implementation="org.apache.maven.project.MavenProject">${project}</mavenProject>
- <sourceEncoding implementation="java.lang.String" default-value="${project.build.sourceEncoding}"/>
- <testGeneratedMetadata implementation="java.io.File" default-value="${project.build.testOutputDirectory}/META-INF/plexus/components.xml"/>
- <testIntermediaryMetadata implementation="java.io.File" default-value="${project.build.directory}/test-components.xml"/>
- <testStaticMetadataDirectory implementation="java.io.File" default-value="${basedir}/src/test/resources/META-INF/plexus"/>
- </configuration>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.MavenProjectHelper</role>
- <field-name>mavenProjectHelper</field-name>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.metadata.MetadataGenerator</role>
- <field-name>metadataGenerator</field-name>
- </requirement>
- </requirements>
- </mojo>
- </mojos>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- <version>2.x</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- <type>jar</type>
- <version>2.x</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <type>jar</type>
- <version>4.x</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <type>jar</type>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis-1.4</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-registry</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-cli</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <type>jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <type>jar</type>
- <version>4.x</version>
- </dependency>
- </dependencies>
-</plugin>
diff --git a/debian/rules b/debian/rules
index 04bb883..93c1df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/")
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps asm4 asm4-core commons-cli guava \
- jdom1 junit4 maven-artifact maven-artifact-manager maven-core \
- maven-model maven-plugin-api maven-project maven2 \
- plexus-classworlds2 plexus-cli plexus-utils2 qdox xbean-reflect
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) \
- -Duse-local-repo=true -Dkeep-cleaned-pom=true
-API_DOCS := target/api
-MODULES := container-default component-annotations component-metadata
+%:
+ dh $@ --buildsystem=maven
get-orig-source:
- uscan --download-version $(VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- set -e; for MODULE in $(MODULES); do \
- mh_installjar -plib$(PACKAGE)-java -l --usj-name=plexus-$$MODULE-1.5 plexus-$$MODULE/pom.xml plexus-$$MODULE/target/plexus-$$MODULE-$(VERSION).jar; \
- done
-
-binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
-
-clean::
- mh_clean
- rm -Rf target
- mh_unpatchpoms -plib$(PACKAGE)-java
+ uscan --download-curent-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git
More information about the pkg-java-commits
mailing list