[libxml-security-java] 11/32: * Use Maven to build the package. Ignore test failures. * Update Description. * Add a documentation package. * Update Homepage field.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Apr 28 23:57:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxml-security-java.
commit ebffc111f4f5cbd76dd8d4ed7193237ef2dddc43
Author: Torsten Werner <twerner at debian.org>
Date: Tue Aug 30 12:10:13 2011 +0000
* Use Maven to build the package. Ignore test failures.
* Update Description.
* Add a documentation package.
* Update Homepage field.
---
debian/{README.Debian-source => README.source} | 14 ++++++--
debian/TODO | 1 +
debian/ant.properties | 4 ---
debian/build.xml | 38 ----------------------
debian/changelog | 6 +++-
debian/control | 39 ++++++++++++++++-------
debian/libxml-security-java-doc.doc-base.api | 10 ++++++
debian/libxml-security-java-doc.install | 2 ++
debian/libxml-security-java.poms | 26 +++++++++++++++
debian/maven.cleanIgnoreRules | 17 ++++++++++
debian/maven.ignoreRules | 17 ++++++++++
debian/maven.properties | 5 +++
debian/maven.publishedRules | 19 +++++++++++
debian/maven.rules | 21 ++++++++++++
debian/patches/0001-change-packaging-to-jar.patch | 22 +++++++++++++
debian/patches/series | 1 +
debian/rules | 13 ++------
17 files changed, 189 insertions(+), 66 deletions(-)
diff --git a/debian/README.Debian-source b/debian/README.source
similarity index 53%
rename from debian/README.Debian-source
rename to debian/README.source
index 0034b92..681f4ae 100644
--- a/debian/README.Debian-source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
-libxml-security-java
-====================
+Information about libxml-security-java
+--------------------------------------
The upstream supplied source package contains binary jar files.
Currently no clean source distribution exists. Therefore, the upstream
@@ -11,3 +11,13 @@ For more details on repackaging of upstream sources please see the
debian/orig-tar.sh file.
-- Varun Hiremath <varunhiremath at gmail.com>, Wed, 7 Nov 2007 12:49:13 +0530
+
+
+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.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 30 Aug 2011 13:44:22 +0200
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..74e46df
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1 @@
+- fix test failures
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 3f7ae0b..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-project.name=xml-security
-class.dir=classes
-source.dir=src
-jar.name=xml-security.jar
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 40ae2f3..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
- <property file="./build.properties" />
- <patternset id="compiler.resources">
- <include name="**/?*.properties" />
- </patternset>
- <target name="clean">
- <delete dir="${class.dir}" quiet="true" />
- <delete file="${jar.name}" quiet="true" />
- <delete dir="${doc.dir}" quiet="true" />
- </target>
-
- <target name="compile">
- <mkdir dir="${class.dir}" />
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- debug="true" source="1.4" target="1.4"/>
- <copy todir="${class.dir}">
- <fileset dir="${source.dir}">
- <patternset refid="compiler.resources" />
- </fileset>
- </copy>
- </target>
-
- <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${jar.name}">
- <fileset dir="${class.dir}"/>
- <fileset dir="${source.dir}"><include name="org/apache/xml/security/resource/**"/></fileset>
- </jar>
- </target>
-
- <target name="javadoc" description="Creates Javadoc documentation">
- <mkdir dir="${doc.dir}" />
- <javadoc packagenames="com.sun.*"
- sourcepath="${source.dir}" destdir="${doc.dir}" />
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 3543e67..34e08b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ libxml-security-java (1.4.5-1) unstable; urgency=low
* Update debian/watch to point to new SVN repo.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.
+ * Use Maven to build the package. Ignore test failures.
+ * Update Description.
+ * Add a documentation package.
+ * Update Homepage field.
- -- Torsten Werner <twerner at debian.org> Tue, 30 Aug 2011 13:44:22 +0200
+ -- Torsten Werner <twerner at debian.org> Tue, 30 Aug 2011 14:07:46 +0200
libxml-security-java (1.4.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0426ddf..b97e06c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,36 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>,
Niels Thykier <niels at thykier.net>
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
-Build-Depends-Indep: libcommons-logging-java, libxalan2-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-dependency-plugin-java, libcommons-logging-java, libjaxp1.3-java,
+ libxalan2-java, libxerces2-java, junit4, default-jdk-doc, libcommons-logging-java-doc,
+ libxalan2-java-doc, libmaven-javadoc-plugin-java
Standards-Version: 3.9.1
-Homepage: http://xml.apache.org/security/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-scurity-java
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-security-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-security-java
+Homepage: http://santuario.apache.org/
Package: libxml-security-java
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
-Description: implementation of security standards for XML
- The XML Security project is aimed at providing implementation of
- security standards for XML. Currently the focus is on the W3C
- standards :
- * XML-Signature Syntax and Processing; and
- * XML Encryption Syntax and Processing.
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libxml-security-java-doc
+Description: Apache Santuario
+ Apache Santuario supports XML-Signature Syntax and Processing, W3C
+ Recommendation 12 February 2002, and XML Encryption Syntax and Processing, W3C
+ Recommendation 10 December 2002. As of version 1.4, the Java library supports
+ the standard Java API JSR-105: XML Digital Signature APIs.
+
+Package: libxml-security-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libxml-security-java
+Description: Documentation for Apache Santuario
+ Apache Santuario supports XML-Signature Syntax and Processing, W3C
+ Recommendation 12 February 2002, and XML Encryption Syntax and Processing, W3C
+ Recommendation 10 December 2002. As of version 1.4, the Java library supports
+ the standard Java API JSR-105: XML Digital Signature APIs.
+ .
+ This package contains the API documentation of libxml-security-java.
diff --git a/debian/libxml-security-java-doc.doc-base.api b/debian/libxml-security-java-doc.doc-base.api
new file mode 100644
index 0000000..2583c81
--- /dev/null
+++ b/debian/libxml-security-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libxml-security-java
+Title: API Javadoc for Apache Santuario
+Author: The Apache Software Foundation developers
+Abstract: This is the API Javadoc provided for the
+ libxml-security-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libxml-security-java/api/index.html
+Files: /usr/share/doc/libxml-security-java/api/*
diff --git a/debian/libxml-security-java-doc.install b/debian/libxml-security-java-doc.install
new file mode 100644
index 0000000..7150353
--- /dev/null
+++ b/debian/libxml-security-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libxml-security-java/api
+
diff --git a/debian/libxml-security-java.poms b/debian/libxml-security-java.poms
new file mode 100644
index 0000000..9ec5af5
--- /dev/null
+++ b/debian/libxml-security-java.poms
@@ -0,0 +1,26 @@
+# 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
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..0adb0d8
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,17 @@
+# 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.felix maven-bundle-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..16360f6
--- /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.failure.ignore=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
new file mode 100644
index 0000000..7dae268
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,21 @@
+# 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/4\..*/4.x/ * *
+org.apache.santuario xmlsec bundle s/.*/debian/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
diff --git a/debian/patches/0001-change-packaging-to-jar.patch b/debian/patches/0001-change-packaging-to-jar.patch
new file mode 100644
index 0000000..6e38028
--- /dev/null
+++ b/debian/patches/0001-change-packaging-to-jar.patch
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Tue, 30 Aug 2011 13:59:54 +0200
+Subject: [PATCH] change packaging to jar
+
+---
+ pom.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 1dfc616..a4a7964 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -22,7 +22,7 @@
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+- <packaging>bundle</packaging>
++ <packaging>jar</packaging>
+ <name>Apache Santuario</name>
+ <version>1.4.5</version>
+ <description>
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..73c6e3d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-change-packaging-to-jar.patch
diff --git a/debian/rules b/debian/rules
index fe05401..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := commons-logging xalan2
-
-install/libxml-security-java::
- install -m 644 -D xml-security.jar $(DEB_DESTDIR)/usr/share/java/xml-security-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/xml-security-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xml-security.jar
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-security-java.git
More information about the pkg-java-commits
mailing list