[pkg-java] r19044 - trunk/commons-jci/debian
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 3 10:48:32 UTC 2016
Author: ebourg-guest
Date: 2016-05-03 10:48:31 +0000 (Tue, 03 May 2016)
New Revision: 19044
Added:
trunk/commons-jci/debian/maven.ignoreRules
trunk/commons-jci/debian/maven.properties
Removed:
trunk/commons-jci/debian/build.properties
trunk/commons-jci/debian/build.xml
trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms
trunk/commons-jci/debian/libcommons-jci-groovy-java.poms
trunk/commons-jci/debian/libcommons-jci-janino-java.poms
trunk/commons-jci/debian/libcommons-jci-rhino-java.poms
Modified:
trunk/commons-jci/debian/changelog
trunk/commons-jci/debian/control
trunk/commons-jci/debian/libcommons-jci-java-doc.install
trunk/commons-jci/debian/libcommons-jci-java.poms
trunk/commons-jci/debian/maven.rules
trunk/commons-jci/debian/rules
Log:
Build with maven-debian-helper instead of maven-ant-helper
Deleted: trunk/commons-jci/debian/build.properties
===================================================================
--- trunk/commons-jci/debian/build.properties 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/build.properties 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,14 +0,0 @@
-maven.test.skip=true
-maven.jar.manifest.classpath.add=true
-build.javaVersion=1.5
-classpath.compile = \
- /usr/share/java/commons-io.jar:\
- /usr/share/java/commons-lang.jar:\
- /usr/share/java/commons-logging.jar:\
- /usr/share/java/asm4.jar:\
- /usr/share/java/groovy-2.x.jar:\
- /usr/share/java/js.jar:\
- /usr/share/java/janino.jar:\
- /usr/share/java/eclipse-ecj.jar:\
- ${basedir}/fam/build/commons-jci-fam-${version}.jar:\
- ${basedir}/core/build/commons-jci-core-${version}.jar
Deleted: trunk/commons-jci/debian/build.xml
===================================================================
--- trunk/commons-jci/debian/build.xml 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/build.xml 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<project name="commons-jci" 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="fam"/>
- <cleanmodule dir="core"/>
- <cleanmodule dir="compilers/groovy"/>
- <cleanmodule dir="compilers/rhino"/>
- <cleanmodule dir="compilers/janino"/>
- <cleanmodule dir="compilers/eclipse"/>
- </target>
-
- <target name="package">
- <packagemodule dir="fam"/>
- <packagemodule dir="core"/>
- <packagemodule dir="compilers/groovy"/>
- <packagemodule dir="compilers/rhino"/>
- <packagemodule dir="compilers/janino"/>
- <packagemodule dir="compilers/eclipse"/>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="fam/src/main/java/"/>
- <packageset dir="core/src/main/java/"/>
- <packageset dir="compilers/groovy/src/main/java/"/>
- <packageset dir="compilers/rhino/src/main/java/"/>
- <packageset dir="compilers/janino/src/main/java/"/>
- <packageset dir="compilers/eclipse/src/main/java/"/>
- <link href="/usr/share/doc/default-jdk-doc/api/"/>
- </javadoc>
- </target>
-
-</project>
Modified: trunk/commons-jci/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/changelog 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,6 +1,7 @@
commons-jci (1.1-4) UNRELEASED; urgency=medium
* Team upload.
+ * Build with maven-debian-helper instead of maven-ant-helper
* Standards-Version updated to 3.9.8 (no changes)
-- Emmanuel Bourg <ebourg at apache.org> Tue, 03 May 2016 10:10:28 +0200
Modified: trunk/commons-jci/debian/control
===================================================================
--- trunk/commons-jci/debian/control 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/control 2016-05-03 10:48:31 UTC (rev 19044)
@@ -4,17 +4,21 @@
Emmanuel Bourg <ebourg at apache.org>
Section: java
Priority: optional
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-ant-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
Build-Depends-Indep: default-jdk-doc,
groovy2,
+ junit4,
libasm4-java,
libcommons-io-java,
- libcommons-lang-java,
+ libcommons-lang3-java,
libcommons-logging-java,
+ libcommons-parent-java,
libecj-java,
libjanino-java (>= 2.6.0),
- librhino-java,
- maven-repo-helper
+ libmaven-antrun-plugin-java,
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ librhino-java
Standards-Version: 3.9.8
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-jci/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-jci/
@@ -24,8 +28,9 @@
Architecture: all
Depends: libasm4-java,
libcommons-io-java,
- libcommons-lang-java,
+ libcommons-lang3-java,
libcommons-logging-java,
+ libcommons-parent-java,
${misc:Depends}
Description: common Java interface for various compilers - Core and FAM
Commons JCI is a common Java compiler interface for various compilers.
Deleted: trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1 +0,0 @@
-compilers/eclipse/pom.xml
Deleted: trunk/commons-jci/debian/libcommons-jci-groovy-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-groovy-java.poms 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-groovy-java.poms 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1 +0,0 @@
-compilers/groovy/pom.xml
Deleted: trunk/commons-jci/debian/libcommons-jci-janino-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-janino-java.poms 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-janino-java.poms 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1 +0,0 @@
-compilers/janino/pom.xml
Modified: trunk/commons-jci/debian/libcommons-jci-java-doc.install
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-java-doc.install 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-java-doc.install 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1 +1 @@
-build/docs/api usr/share/doc/libcommons-jci-java/
+target/site/apidocs/* usr/share/doc/libcommons-jci-java/api/
Modified: trunk/commons-jci/debian/libcommons-jci-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-java.poms 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-java.poms 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,3 +1,35 @@
-pom.xml --no-parent
-core/pom.xml
-fam/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]
+#
+pom.xml --no-parent --has-package-version
+core/pom.xml --has-package-version
+compilers/eclipse/pom.xml --has-package-version --package=libcommons-jci-eclipse-java
+compilers/groovy/pom.xml --has-package-version --package=libcommons-jci-groovy-java
+compilers/janino/pom.xml --has-package-version --package=libcommons-jci-janino-java
+compilers/rhino/pom.xml --has-package-version --package=libcommons-jci-rhino-java
+examples/pom.xml --ignore
+fam/pom.xml --has-package-version
Deleted: trunk/commons-jci/debian/libcommons-jci-rhino-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-rhino-java.poms 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/libcommons-jci-rhino-java.poms 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1 +0,0 @@
-compilers/rhino/pom.xml
Added: trunk/commons-jci/debian/maven.ignoreRules
===================================================================
--- trunk/commons-jci/debian/maven.ignoreRules (rev 0)
+++ trunk/commons-jci/debian/maven.ignoreRules 2016-05-03 10:48:31 UTC (rev 19044)
@@ -0,0 +1,8 @@
+
+org.apache.commons commons-jci-core * * * test
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-jxr-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+org.codehaus.mojo taglist-maven-plugin * * * *
Added: trunk/commons-jci/debian/maven.properties
===================================================================
--- trunk/commons-jci/debian/maven.properties (rev 0)
+++ trunk/commons-jci/debian/maven.properties 2016-05-03 10:48:31 UTC (rev 19044)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
Modified: trunk/commons-jci/debian/maven.rules
===================================================================
--- trunk/commons-jci/debian/maven.rules 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/maven.rules 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,4 +1,6 @@
-commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
-junit junit jar s/3\..*/3.x/
-org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.4.3/
-s/groovy/org.codehaus.groovy/ s/groovy-all/groovy/ * s/.*/2.x/
+
+junit junit jar s/.*/4.x/ * *
+org.apache.commons commons-jci-core * * * test
+s/asm/org.ow2.asm/ asm * s/.*/4.x/ * *
+org.apache.commons commons-lang3 * s/.*/3.x/ * *
+org.codehaus.groovy groovy-all * s/.*/2.x/ * *
Modified: trunk/commons-jci/debian/rules
===================================================================
--- trunk/commons-jci/debian/rules 2016-05-03 08:10:51 UTC (rev 19043)
+++ trunk/commons-jci/debian/rules 2016-05-03 10:48:31 UTC (rev 19044)
@@ -1,45 +1,7 @@
#!/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)
-
-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)
-
-binary-post-install/libcommons-jci-java::
- mh_installpoms -plibcommons-jci-java
- mh_installjar -plibcommons-jci-java -l core/pom.xml core/build/commons-jci-core-$(VERSION).jar
- mh_installjar -plibcommons-jci-java -l fam/pom.xml fam/build/commons-jci-fam-$(VERSION).jar
-
-binary-post-install/libcommons-jci-rhino-java::
- mh_installpoms -plibcommons-jci-rhino-java
- mh_installjar -plibcommons-jci-rhino-java -l compilers/rhino/pom.xml compilers/rhino/build/commons-jci-rhino-$(VERSION).jar
-
-binary-post-install/libcommons-jci-groovy-java::
- mh_installpoms -plibcommons-jci-groovy-java
- mh_installjar -plibcommons-jci-groovy-java -l compilers/groovy/pom.xml compilers/groovy/build/commons-jci-groovy-$(VERSION).jar
-
-binary-post-install/libcommons-jci-janino-java::
- mh_installpoms -plibcommons-jci-janino-java
- mh_installjar -plibcommons-jci-janino-java -l compilers/janino/pom.xml compilers/janino/build/commons-jci-janino-$(VERSION).jar
-
-binary-post-install/libcommons-jci-eclipse-java::
- mh_installpoms -plibcommons-jci-eclipse-java
- mh_installjar -plibcommons-jci-eclipse-java -l compilers/eclipse/pom.xml compilers/eclipse/build/commons-jci-eclipse-$(VERSION).jar
-
-clean::
- mh_clean
- mh_unpatchpoms -plibcommons-jci-java
- mh_unpatchpoms -plibcommons-jci-rhino-java
- mh_unpatchpoms -plibcommons-jci-groovy-java
- mh_unpatchpoms -plibcommons-jci-janino-java
- mh_unpatchpoms -plibcommons-jci-eclipse-java
-
get-orig-source:
- uscan --force-download --rename
+ uscan --download-current-version --force-download --rename
More information about the pkg-java-commits
mailing list