[pkg-java] r14628 - trunk/maven-embedder/debian
Torsten Werner
twerner at alioth.debian.org
Wed Aug 31 14:06:08 UTC 2011
Author: twerner
Date: 2011-08-31 14:06:08 +0000 (Wed, 31 Aug 2011)
New Revision: 14628
Added:
trunk/maven-embedder/debian/TODO
trunk/maven-embedder/debian/libmaven-embedder-java-doc.doc-base.api
trunk/maven-embedder/debian/libmaven-embedder-java-doc.install
trunk/maven-embedder/debian/maven.cleanIgnoreRules
trunk/maven-embedder/debian/maven.ignoreRules
trunk/maven-embedder/debian/maven.properties
trunk/maven-embedder/debian/maven.publishedRules
trunk/maven-embedder/debian/maven.rules
Removed:
trunk/maven-embedder/debian/build.properties
trunk/maven-embedder/debian/build.xml
trunk/maven-embedder/debian/poms/
Modified:
trunk/maven-embedder/debian/README.source
trunk/maven-embedder/debian/changelog
trunk/maven-embedder/debian/control
trunk/maven-embedder/debian/libmaven-embedder-java.poms
trunk/maven-embedder/debian/rules
Log:
* Use Maven to build the package. Ignore test errors.
* Add a documentation package.
* Add Homepage field.
Modified: trunk/maven-embedder/debian/README.source
===================================================================
--- trunk/maven-embedder/debian/README.source 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/README.source 2011-08-31 14:06:08 UTC (rev 14628)
@@ -1,3 +1,9 @@
-This package uses quilt in order to apply patches to the upstream source.
-Patches are stored in debian/patches.
-For further details, check /usr/share/doc/quilt/README.source.
+Information about maven-embedder
+--------------------------------
+
+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.
Added: trunk/maven-embedder/debian/TODO
===================================================================
--- trunk/maven-embedder/debian/TODO (rev 0)
+++ trunk/maven-embedder/debian/TODO 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1 @@
+- fix test errors
Deleted: trunk/maven-embedder/debian/build.properties
===================================================================
--- trunk/maven-embedder/debian/build.properties 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/build.properties 2011-08-31 14:06:08 UTC (rev 14628)
@@ -1,3 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-build.outputDirectory=target/classes
Deleted: trunk/maven-embedder/debian/build.xml
===================================================================
--- trunk/maven-embedder/debian/build.xml 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/build.xml 2011-08-31 14:06:08 UTC (rev 14628)
@@ -1,25 +0,0 @@
-<project name="pkg-java" default="package" basedir="..">
-
- <property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- </target>
-
- <target name="package">
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="maven-embedder"/>
- </ant>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
-
Modified: trunk/maven-embedder/debian/changelog
===================================================================
--- trunk/maven-embedder/debian/changelog 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/changelog 2011-08-31 14:06:08 UTC (rev 14628)
@@ -4,8 +4,11 @@
* Switch to source format 3.0.
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.1.
+ * Use Maven to build the package. Ignore test errors.
+ * Add a documentation package.
+ * Add Homepage field.
- -- Torsten Werner <twerner at debian.org> Wed, 31 Aug 2011 15:12:16 +0200
+ -- Torsten Werner <twerner at debian.org> Wed, 31 Aug 2011 16:03:48 +0200
maven-embedder (2.0.4-2) unstable; urgency=low
Modified: trunk/maven-embedder/debian/control
===================================================================
--- trunk/maven-embedder/debian/control 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/control 2011-08-31 14:06:08 UTC (rev 14628)
@@ -4,16 +4,18 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven2-core-java, default-jdk-doc, libmaven2-core-java-doc, libmaven-javadoc-plugin-java
Standards-Version: 3.9.1
-Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs, maven2, maven-ant-helper,
- libclassworlds-java, libplexus-container-default-java
-Build-Depends-Indep: libmaven2-core-java, maven-repo-helper
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-embedder
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-embedder/
+Homepage: http://maven.apache.org/ref/3.0.3/maven-embedder/index.html
Package: libmaven-embedder-java
Architecture: all
-Depends: ${misc:Depends}, maven2, libmaven2-core-java, libclassworlds-java, libplexus-container-default-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-embedder-java-doc
Description: Maven Embedder
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
@@ -36,3 +38,26 @@
application to run Maven build, an application lifecycle management (ALF)
tool, or Ant tasks that utilize Maven's functionality.
+Package: libmaven-embedder-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmaven-embedder-java
+Description: Documentation for Maven Embedder
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+ * Making the build process easy
+ * Providing a uniform build system
+ * Providing quality project information
+ * Providing guidelines for best practices development
+ * Allowing transparent migration to new features
+ .
+ This package contains the API documentation of libmaven-embedder-java.
Added: trunk/maven-embedder/debian/libmaven-embedder-java-doc.doc-base.api
===================================================================
--- trunk/maven-embedder/debian/libmaven-embedder-java-doc.doc-base.api (rev 0)
+++ trunk/maven-embedder/debian/libmaven-embedder-java-doc.doc-base.api 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1,10 @@
+Document: libmaven-embedder-java
+Title: API Javadoc for Maven Embedder
+Author: Maven Embedder developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-embedder-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-embedder-java/api/index.html
+Files: /usr/share/doc/libmaven-embedder-java/api/*
Added: trunk/maven-embedder/debian/libmaven-embedder-java-doc.install
===================================================================
--- trunk/maven-embedder/debian/libmaven-embedder-java-doc.install (rev 0)
+++ trunk/maven-embedder/debian/libmaven-embedder-java-doc.install 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-embedder-java/api
+
Modified: trunk/maven-embedder/debian/libmaven-embedder-java.poms
===================================================================
--- trunk/maven-embedder/debian/libmaven-embedder-java.poms 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/libmaven-embedder-java.poms 2011-08-31 14:06:08 UTC (rev 14628)
@@ -1 +1,26 @@
-debian/poms/maven-embedder.xml
+# 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 --has-package-version --no-parent
Added: trunk/maven-embedder/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/maven-embedder/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/maven-embedder/debian/maven.cleanIgnoreRules 2011-08-31 14:06:08 UTC (rev 14628)
@@ -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/maven-embedder/debian/maven.ignoreRules
===================================================================
--- trunk/maven-embedder/debian/maven.ignoreRules (rev 0)
+++ trunk/maven-embedder/debian/maven.ignoreRules 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1,20 @@
+# 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/
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
Added: trunk/maven-embedder/debian/maven.properties
===================================================================
--- trunk/maven-embedder/debian/maven.properties (rev 0)
+++ trunk/maven-embedder/debian/maven.properties 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.failure.ignore=true
Added: trunk/maven-embedder/debian/maven.publishedRules
===================================================================
--- trunk/maven-embedder/debian/maven.publishedRules (rev 0)
+++ trunk/maven-embedder/debian/maven.publishedRules 2011-08-31 14:06:08 UTC (rev 14628)
@@ -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/
+
Added: trunk/maven-embedder/debian/maven.rules
===================================================================
--- trunk/maven-embedder/debian/maven.rules (rev 0)
+++ trunk/maven-embedder/debian/maven.rules 2011-08-31 14:06:08 UTC (rev 14628)
@@ -0,0 +1,19 @@
+# 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/
+
+org.apache.maven maven-embedder jar s/.*/debian/ * *
Modified: trunk/maven-embedder/debian/rules
===================================================================
--- trunk/maven-embedder/debian/rules 2011-08-31 13:19:39 UTC (rev 14627)
+++ trunk/maven-embedder/debian/rules 2011-08-31 14:06:08 UTC (rev 14628)
@@ -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
-POM_VERSION := 2.0.4
-MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
+JAVA_HOME := /usr/lib/jvm/default-java
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := maven-artifact maven-artifact-manager maven-core maven-model maven-monitor maven-plugin-api maven-plugin-descriptor maven-profile maven-project maven-settings maven2 wagon-provider-api plexus-utils plexus-container-default-alpha classworlds
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS := target/api
-
get-orig-source:
- uscan --force-download --upstream-version $(VERSION)
-
-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).xml target/$(PACKAGE)-$(VERSION).jar
-
-get-orig-pom:
- mkdir -p debian/poms
- wget -O debian/poms/$(PACKAGE).xml $(MAVEN_REPO)/org/apache/maven/$(PACKAGE)/$(POM_VERSION)/$(PACKAGE)-$(POM_VERSION).pom
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list