[oscache] 01/02: Build with maven-debian-helper instead of Ant
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jun 3 14:28:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository oscache.
commit e1ef610483147a281caf5e823a1f3e233ddbfc4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jun 3 16:26:11 2016 +0200
Build with maven-debian-helper instead of Ant
---
debian/ant.properties | 6 -----
debian/build.xml | 24 -------------------
debian/changelog | 1 +
debian/control | 9 ++++----
debian/liboscache-java.poms | 28 +++++++++++++++++++++++
debian/maven.ignoreRules | 12 ++++++++++
debian/maven.properties | 5 ++++
debian/maven.rules | 3 +++
debian/patches/01-servlet-api-compatibility.patch | 16 +++++++++++++
debian/rules | 17 ++------------
10 files changed, 72 insertions(+), 49 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index fad9a64..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-project.name=oscache
-class.dir=class
-source.dir=src/java
-jar.name=oscache.jar
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index f7864aa..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${class.dir}" quiet="true"/>
- <delete file="${jar.name}" quiet="true"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="true" debug="true" optimize="false"/>
- </target>
-
- <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${jar.name}">
- <fileset dir="${class.dir}">
- <include name="com/**"/>
- </fileset>
- </jar>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index bb50181..4cb019c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ oscache (2.4.1+ds1-5) UNRELEASED; urgency=medium
* Team upload.
* Transition to the Servlet API 3.1
+ * Build with maven-debian-helper instead of Ant
* Standards-Version updated to 3.9.8 (no changes)
* Moved the package to Git
diff --git a/debian/control b/debian/control
index fd99f16..0487c7c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: java
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>
-Build-Depends: cdbs, debhelper (>= 9), maven-repo-helper
-Build-Depends-Indep: ant,
- default-jdk,
+Build-Depends: debhelper (>= 9), maven-debian-helper
+Build-Depends-Indep: default-jdk,
glassfish-javaee,
libcommons-logging-java,
+ libgeronimo-jpa-2.0-spec-java,
libhibernate3-java,
libjgroups-java (>= 2.12.2.Final),
libservlet3.1-java
@@ -18,7 +18,8 @@ Homepage: http://www.opensymphony.com/oscache/
Package: liboscache-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
Description: caching solution for java server pages (JSP)
OSCache is a caching solution that includes a JSP tag library and set
of classes to perform fine grained dynamic caching of JSP content,
diff --git a/debian/liboscache-java.poms b/debian/liboscache-java.poms
new file mode 100644
index 0000000..1d885c3
--- /dev/null
+++ b/debian/liboscache-java.poms
@@ -0,0 +1,28 @@
+# 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 --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..0211087
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,12 @@
+
+groboutils groboutils-core * * * *
+httpunit httpunit * * * *
+junit junit * * * *
+junitperf junitperf * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-idea-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo jxr-maven-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 771605e..d4a9f65 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,3 +17,6 @@
# junit junit jar s/3\..*/3.x/
javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
+javax.servlet.jsp javax.servlet.jsp-api * * * *
+s/jgroups/org.jgroups/ s/jgroups-all/jgroups/ * s/.*/debian/ * *
+org.hibernate s/hibernate/hibernate-core/ * s/.*/debian/ * *
diff --git a/debian/patches/01-servlet-api-compatibility.patch b/debian/patches/01-servlet-api-compatibility.patch
index 4b0ae4f..e823622 100644
--- a/debian/patches/01-servlet-api-compatibility.patch
+++ b/debian/patches/01-servlet-api-compatibility.patch
@@ -13,3 +13,19 @@ Forwarded: no
+ return true;
+ }
}
+--- a/pom.xml
++++ b/pom.xml
+@@ -271,6 +271,13 @@
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>javax.servlet.jsp</groupId>
++ <artifactId>javax.servlet.jsp-api</artifactId>
++ <version>2.3</version>
++ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
diff --git a/debian/rules b/debian/rules
index 5add01c..21e6496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +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_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := commons-logging jgroups servlet-api-3.1 jsp-api-2.3 \
- glassfish-javaee hibernate-core
-
-install/liboscache-java::
- mh_installpom -pliboscache-java pom.xml
- mh_installjar -pliboscache-java pom.xml -l oscache.jar
-
-clean::
- mh_clean
+%:
+ dh $@ --buildsystem=maven
get-orig-source:
uscan --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/oscache.git
More information about the pkg-java-commits
mailing list