[libfreemarker-java] 03/05: Build with ivy-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jun 20 12:27:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libfreemarker-java.
commit 4208ceb94147f3306e8c4b51e6effac7c15765a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jun 20 09:52:54 2016 +0200
Build with ivy-debian-helper
---
debian/changelog | 1 +
debian/control | 6 +-
debian/maven.ignoreRules | 6 ++
debian/maven.rules | 13 +++
debian/patches/exclude-avalon-logger.patch | 10 ---
debian/patches/fix-tests-classpath.patch | 20 ++---
debian/patches/ivy-configuration.patch | 130 -----------------------------
debian/patches/javarebel.diff | 11 ---
debian/rules | 23 ++---
9 files changed, 42 insertions(+), 178 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d904c8d..05f0531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libfreemarker-java (2.3.23-4) UNRELEASED; urgency=medium
* Team upload.
+ * Build with ivy-debian-helper
* Standards-Version updated to 3.9.8 (no changes)
* Use secure Vcs-* fields
diff --git a/debian/control b/debian/control
index f0e2b0a..af9f153 100644
--- a/debian/control
+++ b/debian/control
@@ -10,16 +10,16 @@ Build-Depends: ant,
ant-optional,
antlr3,
bnd,
- cdbs,
debhelper (>= 9),
default-jdk,
default-jdk-doc,
findbugs,
ivy,
+ ivy-debian-helper,
javacc,
jruby,
junit,
- jython,
+ jython (>= 2.5.3-10~),
jython-doc,
libcommons-io-java,
libcommons-jxpath-java,
@@ -37,7 +37,9 @@ Build-Depends: ant,
librhino-java,
librhino-java-doc,
libservlet2.5-java,
+ libservlet3.1-java,
libslf4j-java,
+ libtomcat8-java,
libxalan2-java,
libxalan2-java-doc,
libxerces2-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..c0d539c
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,6 @@
+
+avalon-logkit avalon-logkit * * * *
+displaytag displaytag * * * *
+org.freemarker docgen * * * *
+org.zeroturnaround javarebel-sdk * * * *
+saxpath saxpath * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..d4c4716
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,13 @@
+
+asm * * s/.*/3.x/ * *
+com.google.guava s/guava-jdk5/guava/ * s/.*/debian/ * *
+javax.el javax.el-api * s/.*/3.0/ * *
+javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
+javax.servlet jstl * * * *
+javax.servlet javax.servlet-api * s/.*/3.1/ * *
+junit junit * s/.*/4.x/ * *
+org.antlr * * s/.*/3.x/ * *
+org.eclipse.jetty * * s/.*/9.x/ * *
+org.eclipse.jetty s/jetty-jsp/apache-jsp/ * s/.*/debian/ * *
+s/ant/org.apache.ant/ ant * s/.*/debian/ * *
+s/biz.aQute/biz.aQute.bnd/ bnd * s/.*/debian/ * *
diff --git a/debian/patches/exclude-avalon-logger.patch b/debian/patches/exclude-avalon-logger.patch
index 5669b49..560d718 100644
--- a/debian/patches/exclude-avalon-logger.patch
+++ b/debian/patches/exclude-avalon-logger.patch
@@ -11,13 +11,3 @@ Forwarded: not-needed
freemarker/ext/beans/_EnumModels.java,
freemarker/ext/beans/JRebelClassChangeNotifier.java,
freemarker/ext/dom/SunInternalXalanXPathSupport.java,
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -108,7 +108,6 @@
- <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" />
- <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />
-
-- <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" />
- <dependency org="org.slf4j" name="slf4j-api" rev="&slf4j.version;" conf="build.base->default" />
- <dependency org="org.slf4j" name="log4j-over-slf4j" rev="&slf4j.version;" conf="build.base->default" />
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" />
diff --git a/debian/patches/fix-tests-classpath.patch b/debian/patches/fix-tests-classpath.patch
index 124fdac..04f4a2a 100644
--- a/debian/patches/fix-tests-classpath.patch
+++ b/debian/patches/fix-tests-classpath.patch
@@ -3,18 +3,18 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/ivy.xml
+++ b/ivy.xml
-@@ -95,6 +95,14 @@
+@@ -96,6 +96,14 @@
<!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: -->
<exclude org="xml-apis" module="xml-apis" />
</dependency>
+
-+ <dependency org="org.jruby.extras" name="constantine" rev="0.7" conf="build.test->default; test->default" />
-+ <dependency org="org.jruby" name="jruby" rev="1.7.11" conf="build.test->default; test->default" />
-+ <dependency org="org.antlr" name="antlr3" rev="3.2" conf="build.test->default; test->default" />
-+ <dependency org="org.antlr" name="antlr3-runtime" rev="3.2" conf="build.test->default; test->default" />
-+ <dependency org="asm" name="asm3-all" rev="3.3" conf="build.test->default; test->default" />
-+ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.test->default; test->default" />
-+ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.test->default; test->default" />
++ <dependency org="com.github.jnr" name="jnr-constants" rev="debian" conf="build.test->default; test->default" />
++ <dependency org="org.jruby" name="jruby-complete" rev="1.7.11" conf="build.test->default; test->default" />
++ <dependency org="org.antlr" name="antlr" rev="3.2" conf="build.test->default; test->default" />
++ <dependency org="org.antlr" name="antlr-runtime" rev="3.2" conf="build.test->default; test->default" />
++ <dependency org="asm" name="asm-all" rev="3.3" conf="build.test->default; test->default" />
++ <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.test->default; test->default" />
++ <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.test->default; test->default" />
- <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.0->default; example.struts-webapp->default" />
- <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.0->default; example.servlet->default" />
+ <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
+ <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
diff --git a/debian/patches/ivy-configuration.patch b/debian/patches/ivy-configuration.patch
index 6994bd5..7454f55 100644
--- a/debian/patches/ivy-configuration.patch
+++ b/debian/patches/ivy-configuration.patch
@@ -1,136 +1,6 @@
Description: Modifies the ivy configuration to use the jars in /usr/share/java
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/ivysettings.xml
-+++ b/ivysettings.xml
-@@ -1,35 +1,12 @@
- <ivysettings>
-- <!-- Prevent IvyDE error: -->
-- <property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false" />
--
-- <caches defaultCacheDir="${ivy.project.dir}/.ivy/cache">
-- <cache name="cacheForPrivate" useOrigin="true" defaultTTL="1s" />
--
-- <!--
-- Rather don't use useOrigin="true" here, as deleting from the target repo breaks the cache then.
-- -->
-- <cache name="cacheForLocalOverride"
-- basedir="${user.home}/.ivy2/freemarker-devel-local-override-cache"
-- defaultTTL="1s" lockStrategy="artifact-lock"
-- />
-- </caches>
-+ <settings defaultResolver="debian" />
- <resolvers>
-- <chain name="freemarker-devel-local" returnFirst="true">
-- <filesystem name="freemarker-devel-local-override" cache="cacheForLocalOverride">
-- <ivy pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/ivy-[revision].xml" />
-- <artifact pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/[artifact]-[revision].[ext]" />
-- </filesystem>
-- <filesystem name="project-private" cache="cacheForPrivate">
-- <ivy pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/ivy-[revision].xml" />
-- <artifact pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/[artifact]-[revision].[ext]" />
-- </filesystem>
-- </chain>
-- <filesystem name="server-publishing-target">
-- <ivy pattern="${server.ivy.repo.root}/[organisation]/[module]/ivy-[revision].xml" />
-- <artifact pattern="${server.ivy.repo.root}/[organisation]/[module]/[artifact]-[revision].[ext]" />
-+ <filesystem name="debian">
-+<!-- <ivy pattern="${user.home}/.ivy2/debian/[organisation]/[module]/ivy-[revision].xml" />-->
-+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
- </filesystem>
- </resolvers>
- <modules>
-- <module organisation="*" resolver="freemarker-devel-local" />
-+ <module organisation="*" resolver="debian" />
- </modules>
- </ivysettings>
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -84,25 +84,23 @@
- <!-- build -->
-
- <dependency org="jaxen" name="jaxen" rev="1.0-FCS" conf="build.base->default" />
-- <dependency org="saxpath" name="saxpath" rev="1.0-FCS" conf="build.base->default" />
-- <dependency org="xalan" name="xalan" rev="2.7.0" conf="build.base->default">
-+ <dependency org="xalan" name="xalan2" rev="2.7.0" conf="build.base->default">
- <!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: -->
- <exclude org="xml-apis" module="xml-apis" />
- </dependency>
- <dependency org="dom4j" name="dom4j" rev="1.3" conf="build.base->default" /> <!-- legacy -->
-- <dependency org="org.jdom" name="jdom" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy -->
-+ <dependency org="org.jdom" name="jdom1" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy -->
-
- <dependency org="ant" name="ant" rev="1.6.5" conf="build.base->default">
- <!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: -->
- <exclude org="xml-apis" module="xml-apis" />
- </dependency>
-
-- <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
-- <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
-- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default; example.struts-webapp->default" />
-- <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default; example.servlet->default" />
-- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
-- <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
-+ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.0->default; example.struts-webapp->default" />
-+ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.0->default; example.servlet->default" />
-+ <dependency org="javax.el" name="el-api-2.1" rev="2.1" conf="build.jsp2.1->default" />
-+ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.1->default" />
-+ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.1->default" />
-
- <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
-
-@@ -116,7 +114,7 @@
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" />
- <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />
-
-- <dependency org="com.google.code.findbugs" name="annotations" rev="3.0.0" conf="build.base->default" />
-+ <dependency org="com.google.code.findbugs" name="findbugs-annotations" rev="3.0.0" conf="build.base->default" />
-
- <!--dependency org="javax.script" name="script-api" rev="1.0" conf="build.base->default" /-->
- <!--dependency org="org.visigoths" name="cavalry" rev="1.0" conf="build.base->default" /-->
-@@ -124,29 +122,18 @@
- <!-- test -->
-
- <!-- Note: Ant doesn't contain junit.jar any more -->
-- <dependency org="junit" name="junit" rev="4.12" conf="test->default" />
-+ <dependency org="junit" name="junit4" rev="4.12" conf="test->default" />
- <dependency org="org.hamcrest" name="hamcrest-library" rev="1.3" conf="test->default" />
-
- <dependency org="ch.qos.logback" name="logback-classic" rev="1.1.2" conf="test->default" />
-
- <dependency org="commons-io" name="commons-io" rev="2.2" conf="test->default" />
-- <dependency org="com.google.guava" name="guava-jdk5" rev="17.0" conf="test->default" />
-+ <dependency org="com.google.guava" name="guava" rev="17.0" conf="test->default" />
-
-- <dependency org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;" conf="test->default" />
-- <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="&jetty.version;" conf="test->default" />
-- <dependency org="org.eclipse.jetty" name="jetty-jsp" rev="&jetty.version;" conf="test->default" />
-- <dependency org="org.eclipse.jetty" name="jetty-util" rev="&jetty.version;" conf="test->default" />
--
-- <dependency org="displaytag" name="displaytag" rev="1.2" conf="test->default">
-- <exclude org="com.lowagie" name="itext" />
-- <exclude org="org.slf4j" name="slf4j-log4j12" />
-- <exclude org="org.slf4j" name="jcl104-over-slf4j" />
-- <exclude org="log4j" name="log4j" />
-- </dependency>
--
-- <!-- docs -->
--
-- <dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="manual->default" changing="true" />
-+ <dependency org="org.eclipse.jetty" name="jetty9-server" rev="&jetty.version;" conf="test->default" />
-+ <dependency org="org.eclipse.jetty" name="jetty9-webapp" rev="&jetty.version;" conf="test->default" />
-+ <!--<dependency org="org.eclipse.jetty" name="jetty9-jsp" rev="&jetty.version;" conf="test->default" />-->
-+ <dependency org="org.eclipse.jetty" name="jetty9-util" rev="&jetty.version;" conf="test->default" />
-
- <!-- parser -->
-
-@@ -164,4 +151,4 @@
- <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
-
- </dependencies>
--</ivy-module>
-\ No newline at end of file
-+</ivy-module>
--- a/build.xml
+++ b/build.xml
@@ -1008,29 +1008,11 @@
diff --git a/debian/patches/javarebel.diff b/debian/patches/javarebel.diff
index 84c3a8e..45f0dd3 100644
--- a/debian/patches/javarebel.diff
+++ b/debian/patches/javarebel.diff
@@ -13,14 +13,3 @@ Last-Update: 2009-09-27
freemarker/ext/dom/SunInternalXalanXPathSupport.java,
freemarker/ext/jsp/**,
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -116,8 +116,6 @@
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" />
- <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />
-
-- <dependency org="org.zeroturnaround" name="javarebel-sdk" rev="1.2.2" conf="build.base->default" />
--
- <dependency org="com.google.code.findbugs" name="annotations" rev="3.0.0" conf="build.base->default" />
-
- <!--dependency org="javax.script" name="script-api" rev="1.0" conf="build.base->default" /-->
diff --git a/debian/rules b/debian/rules
index b2038d8..91d92da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,20 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
POM_VERSION := 2.3.23
MAVEN_REPO := http://repo1.maven.org/maven2/
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := javacc jar javadoc
-#DEB_ANT_CHECK_TARGET := test
-DEB_ANT_ARGS := -Divy.default.ivy.user.dir=$(shell pwd)/.ivy -Dtitlebar.found=true \
- -DTODAY= -DDSTAMP= -DTSTAMP= -DtimestampNice= -DtimestampInVersion=
-
-DEB_JARS := ant-nodeps junit ant-junit ivy
+%:
+ dh $@ --buildsystem=ivy --with maven_repo_helper
-install/libfreemarker-java::
- mh_installpoms -plibfreemarker-java
- mh_installjar -plibfreemarker-java -l debian/pom.xml build/freemarker.jar
+override_dh_auto_build:
+ dh_auto_build -- -Divy.default.ivy.user.dir=$(shell pwd)/.ivy -Dtitlebar.found=true \
+ -DTODAY= -DDSTAMP= -DTSTAMP= -DtimestampNice= -DtimestampInVersion= \
+ javacc jar javadoc
-clean::
- mh_clean
- rm -Rf .ivy
+override_dh_auto_clean:
+ rm -Rf build .ivy
get-orig-source:
uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libfreemarker-java.git
More information about the pkg-java-commits
mailing list