[tomcat8] 04/14: No longer alter the poms in debian/javaxpoms during the build. They are copied and transformed in the temporary debian/poms directory.
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Sep 13 16:04:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 51ed197556e699151bec0c40b81fbb64fa49923b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Sep 13 13:59:59 2013 +0200
No longer alter the poms in debian/javaxpoms during the build. They are copied and transformed in the temporary debian/poms directory.
---
debian/changelog | 2 ++
debian/rules | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1181d91..e8afeba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
* Mentioned 'Apache Tomcat' in the packages descriptions
* Deploy the Tomcat artifacts in the Maven repository with the 8.x version
instead of 'debian' to avoid conflicts with other versions of Tomcat.
+ * No longer alter the poms in debian/javaxpoms during the build. They are
+ copied and transformed in the temporary debian/poms directory.
-- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 16:10:10 +0200
diff --git a/debian/rules b/debian/rules
index 849cb59..7f21e64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,12 +98,13 @@ binary-indep: build install
mkdir -p debian/poms
cp res/maven/*.pom debian/poms
+ cp debian/javaxpoms/*.pom debian/poms
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/' debian/poms/tomcat-servlet-api.pom
- perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/' debian/javaxpoms/servlet-api.pom
+ perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/' debian/poms/servlet-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' debian/poms/tomcat-el-api.pom
- perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' debian/javaxpoms/el-api.pom
+ perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' debian/poms/el-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/' debian/poms/tomcat-jsp-api.pom
- perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/' debian/javaxpoms/jsp-api.pom
+ perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/' debian/poms/jsp-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
mh_installpoms -plibtomcat8-java
@@ -134,11 +135,11 @@ binary-indep: build install
mh_installpoms -plibservlet3.1-java
mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-servlet-api.pom output/build/lib/servlet-api.jar
- mh_installjar -plibservlet3.1-java -l -s debian/javaxpoms/servlet-api.pom output/build/lib/servlet-api.jar
+ mh_installjar -plibservlet3.1-java -l -s debian/poms/servlet-api.pom output/build/lib/servlet-api.jar
mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-jsp-api.pom output/build/lib/jsp-api.jar
- mh_installjar -plibservlet3.1-java -l -s debian/javaxpoms/jsp-api.pom output/build/lib/jsp-api.jar
+ mh_installjar -plibservlet3.1-java -l -s debian/poms/jsp-api.pom output/build/lib/jsp-api.jar
mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-el-api.pom output/build/lib/el-api.jar
- mh_installjar -plibservlet3.1-java -l -s debian/javaxpoms/el-api.pom output/build/lib/el-api.jar
+ mh_installjar -plibservlet3.1-java -l -s debian/poms/el-api.pom output/build/lib/el-api.jar
rm -r debian/poms
rm -rf \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list