[tiles] 34/35: Build with maven-debian-helper

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Apr 1 22:31:34 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tiles.

commit 38a94e511b85e10255fae01e68d7b323225a5f24
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Apr 2 00:07:12 2016 +0200

    Build with maven-debian-helper
---
 debian/build.properties          | 32 ----------------
 debian/build.xml                 | 81 ----------------------------------------
 debian/changelog                 |  1 +
 debian/control                   | 20 ++++------
 debian/libtiles-java-doc.install |  2 +-
 debian/libtiles-java.poms        | 58 +++++++++++++++++++++-------
 debian/maven.ignoreRules         | 11 ++++++
 debian/maven.properties          |  5 +++
 debian/maven.rules               |  2 +-
 debian/rules                     | 38 ++++++++-----------
 10 files changed, 87 insertions(+), 163 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 45cf7af..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
-build.javaVersion=1.5
-classpath.compile = \
-            /usr/share/java/slf4j-api.jar:\
-            /usr/share/java/commons-digester.jar:\
-            /usr/share/java/ognl.jar:\
-            /usr/share/java/mvel2.jar:\
-            /usr/share/java/servlet-api-2.5.jar:\
-            /usr/share/java/jsp-api-2.1.jar:\
-            /usr/share/java/el-api-2.1.jar:\
-            /usr/share/java/tomcat8-jasper-el.jar:\
-            /usr/share/java/spring3-core.jar:\
-            /usr/share/java/spring3-web.jar:\
-            /usr/share/java/freemarker.jar:\
-            /usr/share/java/velocity.jar:\
-            /usr/share/java/velocity-tools-view.jar:\
-            ${basedir}/src/tiles-api/build/tiles-api-${version}.jar:\
-            ${basedir}/src/tiles-core/build/tiles-core-${version}.jar:\
-            ${basedir}/src/tiles-compat/build/tiles-compat-${version}.jar:\
-            ${basedir}/src/tiles-el/build/tiles-el-${version}.jar:\
-            ${basedir}/src/tiles-freemarker/build/tiles-freemarker-${version}.jar:\
-            ${basedir}/src/tiles-mvel/build/tiles-mvel-${version}.jar:\
-            ${basedir}/src/tiles-ognl/build/tiles-ognl-${version}.jar:\
-            ${basedir}/src/tiles-servlet/build/tiles-servlet-${version}.jar:\
-            ${basedir}/src/tiles-servlet-wildcard/build/tiles-servlet-wildcard-${version}.jar:\
-            ${basedir}/src/tiles-template/build/tiles-template-${version}.jar:\
-            ${basedir}/src/tiles-velocity/build/tiles-velocity-${version}.jar
-# Ensure that source and target are 1.5
-# For backwards compat on Java 7
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index aa37b19..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,81 +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" 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="src/tiles-api"/>
-    <cleanmodule dir="src/tiles-core"/>
-    <cleanmodule dir="src/tiles-el"/>
-    <cleanmodule dir="src/tiles-ognl"/>
-    <cleanmodule dir="src/tiles-mvel"/>
-    <cleanmodule dir="src/tiles-compat"/>
-    <cleanmodule dir="src/tiles-servlet"/>
-    <cleanmodule dir="src/tiles-servlet-wildcard"/>
-    <cleanmodule dir="src/tiles-template"/>
-    <cleanmodule dir="src/tiles-jsp"/>
-    <cleanmodule dir="src/tiles-freemarker"/>
-    <cleanmodule dir="src/tiles-velocity"/>
-    <cleanmodule dir="src/tiles-extras"/>
-  </target>
-
-  <target name="package">
-    <packagemodule dir="src/"/>
-    <packagemodule dir="src/tiles-api"/>
-    <packagemodule dir="src/tiles-core"/>
-    <packagemodule dir="src/tiles-el"/>
-    <packagemodule dir="src/tiles-ognl"/>
-    <packagemodule dir="src/tiles-mvel"/>
-    <packagemodule dir="src/tiles-compat"/>
-    <packagemodule dir="src/tiles-servlet"/>
-    <packagemodule dir="src/tiles-servlet-wildcard"/>
-    <packagemodule dir="src/tiles-template"/>
-    <packagemodule dir="src/tiles-jsp"/>
-    <packagemodule dir="src/tiles-freemarker"/>
-    <packagemodule dir="src/tiles-velocity"/>
-    <packagemodule dir="src/tiles-extras"/>
-  </target>
-
-  <target name="javadoc">
-    <javadoc destdir="${javadoc.dir}" locale="en" additionalparam="-notimestamp">
-      <packageset dir="src/tiles-api/src/main/java/"/>
-      <packageset dir="src/tiles-core/src/main/java/"/>
-      <packageset dir="src/tiles-el/src/main/java/"/>
-      <packageset dir="src/tiles-ognl/src/main/java/"/>
-      <packageset dir="src/tiles-mvel/src/main/java/"/>
-      <packageset dir="src/tiles-compat/src/main/java/"/>
-      <packageset dir="src/tiles-servlet/src/main/java/"/>
-      <packageset dir="src/tiles-servlet-wildcard/src/main/java/"/>
-      <packageset dir="src/tiles-template/src/main/java/"/>
-      <packageset dir="src/tiles-jsp/src/main/java/"/>
-      <packageset dir="src/tiles-freemarker/src/main/java/"/>
-      <packageset dir="src/tiles-velocity/src/main/java/"/>
-      <packageset dir="src/tiles-extras/src/main/java/"/>
-    </javadoc>
-  </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 573c9d3..22e2667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 tiles (2.2.2-7) UNRELEASED; urgency=medium
 
+  * Build with maven-debian-helper
   * Moved the package to Git
   * Standards-Version updated to 3.9.7 (n ochanges)
 
diff --git a/debian/control b/debian/control
index 0c84074..8414e54 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,11 @@ 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, maven-ant-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-ant-helper
 Build-Depends-Indep: libcommons-digester-java,
                      libfreemarker-java,
+                     libmaven-bundle-plugin-java,
+                     libmaven-javadoc-plugin-java,
                      libmvel-java,
                      libognl-java,
                      libservlet2.5-java,
@@ -14,7 +16,7 @@ Build-Depends-Indep: libcommons-digester-java,
                      libspring-web-java,
                      libtomcat8-java,
                      libvelocity-tools-java,
-                     maven-repo-helper
+                     maven-debian-helper
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/tiles.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tiles.git
@@ -22,14 +24,8 @@ Homepage: http://tiles.apache.org
 
 Package: libtiles-java
 Architecture: all
-Depends: libcommons-digester-java, libslf4j-java, ${misc:Depends}
-Suggests: libfreemarker-java,
-          libmvel-java,
-          libognl-java,
-          libspring-core-java,
-          libspring-web-java,
-          libtomcat8-java,
-          libvelocity-tools-java
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Java templating framework for web application user interfaces
  Apache Tiles is a Java templating framework built to simplify the development
  of web application user interfaces. Tiles allows authors to define page
@@ -45,8 +41,8 @@ Description: Java templating framework for web application user interfaces
 Package: libtiles-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libtiles-java
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Suggests: ${maven:DocOptionalDepends}
 Description: Java templating framework for web application user interfaces - documentation
  Apache Tiles is a Java templating framework built to simplify the development
  of web application user interfaces. Tiles allows authors to define page
diff --git a/debian/libtiles-java-doc.install b/debian/libtiles-java-doc.install
index 6e8bdf7..ede879b 100644
--- a/debian/libtiles-java-doc.install
+++ b/debian/libtiles-java-doc.install
@@ -1 +1 @@
-build/api /usr/share/doc/libtiles-java/
+src/target/site/apidocs/* /usr/share/doc/libtiles-java/api/
diff --git a/debian/libtiles-java.poms b/debian/libtiles-java.poms
index 2476f34..bb71b9f 100644
--- a/debian/libtiles-java.poms
+++ b/debian/libtiles-java.poms
@@ -1,14 +1,44 @@
-src/pom.xml --no-parent
-src/tiles-api/pom.xml
-src/tiles-core/pom.xml
-src/tiles-el/pom.xml
-src/tiles-extras/pom.xml
-src/tiles-ognl/pom.xml
-src/tiles-mvel/pom.xml
-src/tiles-compat/pom.xml
-src/tiles-servlet/pom.xml
-src/tiles-servlet-wildcard/pom.xml
-src/tiles-template/pom.xml
-src/tiles-jsp/pom.xml
-src/tiles-freemarker/pom.xml
-src/tiles-velocity/pom.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 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]
+#
+src/pom.xml --no-parent --has-package-version
+src/tiles-api/pom.xml --has-package-version
+src/tiles-core/pom.xml --has-package-version
+src/tiles-el/pom.xml --has-package-version
+src/tiles-extras/pom.xml --has-package-version
+src/tiles-ognl/pom.xml --has-package-version
+src/tiles-mvel/pom.xml --has-package-version
+src/tiles-compat/pom.xml --has-package-version
+src/tiles-servlet/pom.xml --has-package-version
+src/tiles-servlet-wildcard/pom.xml --has-package-version
+src/tiles-template/pom.xml --has-package-version
+src/tiles-jsp/pom.xml --has-package-version
+src/tiles-freemarker/pom.xml --has-package-version
+src/tiles-velocity/pom.xml --has-package-version
+src/tiles-portlet/pom.xml --ignore
+src/tiles-portlet-wildcard/pom.xml --ignore
+src/assembly/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..e91cb90
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,11 @@
+junit junit * * * *
+net.sourceforge.maven-taglib maven-taglib-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.shale shale-test * * * *
+org.codehaus.mojo jxr-maven-plugin * * * *
+org.codehaus.mojo rat-maven-plugin * * * *
+org.easymock easymockclassextension * * * *
+net.sf.dtddoc dtddoc-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 0e88dea..721026a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 junit junit jar s/3\..*/3.x/
-org.springframework * * s/2\..*/2.x/
+org.springframework * * s/.*/3.x/
 javax.servlet servlet-api jar s/.*/2.5/
 javax.servlet.jsp jsp-api jar s/.*/2.1/
 javax.el el-api jar s/.*/2.1/
diff --git a/debian/rules b/debian/rules
index df53c29..83fd080 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,25 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=maven
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+override_dh_auto_configure:
+	dh_auto_configure
+	mkdir -p src/tiles-test-pom
+	echo '<project><modelVersion>4.0.0</modelVersion><groupId>org.apache.tiles</groupId><artifactId>tiles-test-pom</artifactId><version>2.2.2</version><packaging>pom</packaging></project>' > src/tiles-test-pom/pom.xml
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS             := build/api
+override_dh_auto_build:
+	dh_auto_build -- --file src/pom.xml package javadoc:aggregate
 
-MODULES = api core el extras ognl mvel compat servlet servlet-wildcard template jsp freemarker velocity
+override_dh_auto_test:
+	dh_auto_test -- --file src/pom.xml test
 
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	for MYMOD in $(MODULES); do \
-		POM=`echo src/tiles-$$MYMOD/pom.xml` ;\
-		JAR=`echo src/tiles-$$MYMOD/build/tiles-$$MYMOD-$(VERSION).jar` ;\
-		mh_installjar -plib$(PACKAGE)-java -l $$POM $$JAR; \
-	done
+override_dh_auto_install:
+	dh_auto_install -- --file src/pom.xml
 
-clean::
-	mh_clean
-	-rm -rf debian/tmp
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f src/tiles-test-pom/pom.xml
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles.git



More information about the pkg-java-commits mailing list