[libjdo-api-java] 12/17: Build with maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 1 13:23: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 libjdo-api-java.
commit a8d3df38caa427c8b118338b0294dc480655dd95
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Apr 1 15:00:24 2016 +0200
Build with maven-debian-helper
---
debian/changelog | 4 +-
debian/control | 12 ++--
debian/doc-base | 10 ---
debian/docs | 1 -
debian/jdo2-api-2.2.pom | 83 ----------------------
debian/libjdo-api-java.poms | 34 ++++++++-
debian/maven.ignoreRules | 13 ++++
debian/maven.properties | 5 ++
debian/maven.rules | 9 ++-
debian/patches/enable_build_with_ant.diff | 49 -------------
debian/patches/series | 2 -
.../patches/set_explicit_java_binary_target.diff | 24 -------
debian/rules | 18 +----
13 files changed, 71 insertions(+), 193 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fefdb08..23a77b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libjdo-api-java (2.2-3) UNRELEASED; urgency=medium
+libjdo-api-java (3.1-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Build with maven-debian-helper
* Updated debian/watch to catch the latest releases
* Standards-Version updated to 3.9.6 (no changes)
* Moved the package to Git
diff --git a/debian/control b/debian/control
index f52e0f1..5fe83a3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, glassfish-javaee,
- maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-bundle-plugin-java, glassfish-javaee
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/libjdo-api-java.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libjdo-api-java.git
@@ -12,8 +12,9 @@ Homepage: http://db.apache.org/jdo/
Package: libjdo-api-java
Architecture: all
-Depends: ${misc:Depends}
-Description: implementation of JSR 243: Java Data Objects 2.0
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
+Description: Implementation of JSR 243: Java Data Objects 3.1
Java Data Objects (JDO) is a standard way to access persistent data in
databases, using plain old Java objects (POJO) to represent persistent data.
The approach separates data manipulation (done by accessing Java data members
@@ -31,4 +32,5 @@ Description: implementation of JSR 243: Java Data Objects 2.0
.
JDO is being developed as a Java Specification Request in the Java Community
Process. The original JDO 1.0 is JSR-12 http://www.jcp.org/en/jsr/detail?id=12
- and the current JDO 2.0 is JSR-243 http://www.jcp.org/en/jsr/detail?id=243
+ and the current JDO 2.0 is JSR-243 http://www.jcp.org/en/jsr/detail?id=243
+
diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644
index 0dda023..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: libjdo-java
-Title: implementation of JSR 243: Java Data Objects 2.0
-Author: The Apache Software Foundation
-Abstract: Java Data Objects (JDO) is a standard way to access persistent data in
- databases, using plain old Java objects (POJO) to represent persistent data.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjdo-api-java/index.html
-Files: /usr/share/doc/libjdo-api-java/*.html
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a188e06..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/*
diff --git a/debian/jdo2-api-2.2.pom b/debian/jdo2-api-2.2.pom
deleted file mode 100644
index fe9ee05..0000000
--- a/debian/jdo2-api-2.2.pom
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <name>JDO2 API</name>
- <version>${currentVersion}</version>
- <description>The Java Data Objects 2 (JDO) API is a standard interface-based
-Java model abstraction of persistence, developed as Java Specification
-Request 243 under the auspices of the Java Community Process.</description>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>test/java</testSourceDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/..</directory>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>javax/jdo/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>javax/jdo/*.dtd</include>
- <include>javax/jdo/*.xsd</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${basedir}/test/schema</directory>
- <includes>
- <include>**/*.jdo</include>
- <include>**/*.jdoquery</include>
- <include>**/*.orm</include>
- <include>**/jdoconfig.xml</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>javax/jdo/util/AbstractTest.java</exclude>
- <exclude>javax/jdo/pc/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>transaction-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/debian/libjdo-api-java.poms b/debian/libjdo-api-java.poms
index b6b440e..932e54a 100644
--- a/debian/libjdo-api-java.poms
+++ b/debian/libjdo-api-java.poms
@@ -1 +1,33 @@
-debian/jdo2-api-2.2.pom
+# 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 and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version
+parent-pom/pom.xml --has-package-version --no-parent
+api/pom.xml --has-package-version
+exectck/pom.xml --ignore
+copyjdorijars/pom.xml --ignore
+tck/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..ff71d36
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,13 @@
+
+org.apache.jdo copy-jdori-jars jar * * *
+org.apache.jdo jdo-exectck maven-plugin * * *
+org.apache.jdo jdo-tck jar * * *
+junit junit * * * *
+org.apache.ant ant * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.rat apache-rat-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 f9afeeb..4ae18c3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,7 @@
-junit junit * s/.*/3.x/ * *
-s/org\.apache\.geronimo\.specs/javax.persistence/ s/geronimo-jpa_3.0_spec/persistence-api/g * s/.*/debian/ * *
+
+commons-collections commons-collections jar s/3\..*/3.x/ * *
+junit junit jar s/3\..*/3.x/ * *
+org.apache jdo pom * * *
+org.apache.jdo parent-pom pom * * *
+org.apache.maven maven-plugin-api jar s/.*/3.x/ * *
+org.eclipse.persistence javax.persistence * s/2\..*/2.x/ * *
diff --git a/debian/patches/enable_build_with_ant.diff b/debian/patches/enable_build_with_ant.diff
deleted file mode 100644
index da86f94..0000000
--- a/debian/patches/enable_build_with_ant.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: enable build with ant
-Author: Torsten Werner <twerner at debian.org>
-Forwarded: no
-Last-Update: 2010-06-07
-
---- /dev/null
-+++ libjdo-api-java-2.2/build.xml
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<project default="javadoc" name="jdo2-api" basedir=".">
-+ <property file="build.properties"/>
-+
-+ <target name="clean" description="Clean up">
-+ <delete dir="${class.dir}"/>
-+ <delete file="${jar.name}"/>
-+ </target>
-+
-+ <target name="compile" description="Compile the sources">
-+ <mkdir dir="${class.dir}"/>
-+ <javac srcdir="${source.dir}" destdir="${class.dir}"
-+ deprecation="true" debug="true" optimize="false"/>
-+ </target>
-+
-+ <target name="javadoc" description="Creates Javadoc documentation"
-+ depends="jar">
-+ <mkdir dir="${doc.dir}"/>
-+ <javadoc packagenames="${doc.packagenames}"
-+ classpath="${class.dir}/${jar.name}"
-+ sourcepath="${source.dir}" destdir="${doc.dir}"/>
-+ </target>
-+
-+ <target name="jar" description="Create the jar" depends="compile">
-+ <jar jarfile="${jar.name}" basedir="${class.dir}"/>
-+ </target>
-+
-+ <target name="install" depends="jar">
-+ <mkdir dir="${destdir}/usr/share/java/" />
-+ <copy file="${jar.name}" todir="${destdir}/usr/share/java/"/>
-+ </target>
-+</project>
---- /dev/null
-+++ libjdo-api-java-2.2/build.properties
-@@ -0,0 +1,5 @@
-+class.dir=build
-+source.dir=jdo2-api-2.2/src/java
-+jar.name=jdo2-api.jar
-+doc.dir=docs
-+doc.packagenames=javax.jdo.*
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b23fce1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-enable_build_with_ant.diff
-set_explicit_java_binary_target.diff
diff --git a/debian/patches/set_explicit_java_binary_target.diff b/debian/patches/set_explicit_java_binary_target.diff
deleted file mode 100644
index 0805ab3..0000000
--- a/debian/patches/set_explicit_java_binary_target.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Set explicit minimum binary target for Java classes
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2014-02-08
-
---- libjdo-api-java-2.2.orig/build.properties
-+++ libjdo-api-java-2.2/build.properties
-@@ -3,3 +3,5 @@ source.dir=jdo2-api-2.2/src/java
- jar.name=jdo2-api.jar
- doc.dir=docs
- doc.packagenames=javax.jdo.*
-+target=1.5
-+source=1.5
---- libjdo-api-java-2.2.orig/build.xml
-+++ libjdo-api-java-2.2/build.xml
-@@ -11,7 +11,7 @@
- <target name="compile" description="Compile the sources">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
-- deprecation="true" debug="true" optimize="false"/>
-+ target="${target}" source="${source}" deprecation="true" debug="true" optimize="false"/>
- </target>
-
- <target name="javadoc" description="Creates Javadoc documentation"
diff --git a/debian/rules b/debian/rules
index 5ea18d3..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := glassfish-javaee
-UVERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.*: \(.*\)-.*$$/\1/')
+%:
+ dh $@ --buildsystem=maven
get-orig-source:
- uscan --force-download
-
-install/libjdo-api-java::
- mh_installpoms -plibjdo-api-java --set-version=$(UVERSION)
- mh_installjar -plibjdo-api-java debian/jdo2-api-$(UVERSION).pom jdo2-api.jar --java-lib --set-version=$(UVERSION)
-
-clean::
- -rm -rf docs
- mh_clean
+ uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjdo-api-java.git
More information about the pkg-java-commits
mailing list