This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository taglibs-standard.
commit bee5259378f73ed4064b0d78208d44504f626fec Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 21 12:06:31 2016 +0200 Build with maven-debian-helper instead of ant --- debian/ant.properties | 7 --- debian/changelog | 1 + debian/control | 34 ++++++++------ debian/libjakarta-taglibs-standard-java.classpath | 1 - debian/libjakarta-taglibs-standard-java.poms | 1 - debian/libjstl1.1-java.classpath | 1 - debian/libjstl1.1-java.poms | 1 - debian/libtaglibs-standard-spec-java.poms | 34 ++++++++++++++ debian/maven.ignoreRules | 6 +++ debian/maven.properties | 10 +++++ debian/maven.rules | 8 ++-- debian/patches/03-bundle-settings.patch | 54 +++++++++++++++++++++++ debian/patches/series | 1 + debian/poms/jstl.pom | 14 ------ debian/poms/standard.pom | 6 --- debian/rules | 21 +-------- 16 files changed, 134 insertions(+), 66 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 4c1f151..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,7 +0,0 @@ -build.dir=build -dist.dir=dist -ant.build.javac.source=1.5 -ant.build.javac.target=1.5 -servlet24.jar=/usr/share/java/servlet-api-3.1.jar -jsp20.jar=/usr/share/java/jsp-api-2.3.jar -xalan.jar=/usr/share/java/xalan2.jar diff --git a/debian/changelog b/debian/changelog index 4dad600..8a2510d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ taglibs-standard (1.2.5-1) UNRELEASED; urgency=medium - Removed 01-jdbc-compatibility.patch (fixed upstream) - Removed CVE-2015-0254.patch (fixed upstream) - Refreshed 02-servlet-api-compatibility.patch + - Build with maven-debian-helper instead of ant * Renamed the package to taglibs-standard * Standards-Version updated to 3.9.8 * Updated debian/watch to track the releases >= 1.2 diff --git a/debian/control b/debian/control index 12ededf..7a42868 100644 --- a/debian/control +++ b/debian/control @@ -4,33 +4,41 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: - ant, debhelper (>= 9), - javahelper, - maven-repo-helper (>= 1.5~) -Build-Depends-Indep: default-jdk, libservlet3.1-java, libxalan2-java + maven-debian-helper (>= 2.0~) +Build-Depends-Indep: default-jdk, libservlet3.1-java, libxalan2-java, libeasymock-java, junit4, libmaven-bundle-plugin-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/taglibs-standard.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/taglibs-standard.git Homepage: http://tomcat.apache.org/taglibs/standard/ -Package: libjakarta-taglibs-standard-java +Package: libtaglibs-standard-spec-java Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Description: Implementation of JSP Standard Tag Library (JSTL) +Depends: ${misc:Depends} +Description: Apache JSP Standard Taglib Specification API JSTL can be used to embed logic in JSP pages without using embedded java code. Various tags are defined for common tasks such as conditional execution, loops, internationalization, XML processing etc. . - This package is Apache implementation of JSTL specification. + This package is implementation of the JSP Standard Tag Library (JSTL) + Specification API. -Package: libjstl1.1-java +Package: libtaglibs-standard-impl-java Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Description: JSP Standard Tag Library API v1.1 Reference Implementation +Depends: ${misc:Depends}, libtaglibs-standard-spec-java +Description: Apache JSP Standard Taglib Implementation JSTL can be used to embed logic in JSP pages without using embedded java code. Various tags are defined for common tasks such as conditional execution, loops, internationalization, XML processing etc. . - This package is the reference implementation of JSTL 1.1 specification based - on Jakarta taglibs standard.. + This package is an implementation of the JSP Standard Tag Library (JSTL). + +package: libtaglibs-standard-jstlel-java +Architecture: all +Depends: ${misc:Depends}, libtaglibs-standard-spec-java, libtaglibs-standard-impl-java +Description: Apache JSP Standard Taglib 1.0 EL Support + JSTL can be used to embed logic in JSP pages without using embedded java code. + Various tags are defined for common tasks such as conditional execution, loops, + internationalization, XML processing etc. + . + This package contains JSTL 1.0 tags using the original EL implementation. diff --git a/debian/libjakarta-taglibs-standard-java.classpath b/debian/libjakarta-taglibs-standard-java.classpath deleted file mode 100644 index f78e351..0000000 --- a/debian/libjakarta-taglibs-standard-java.classpath +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/standard.jar xalan2.jar diff --git a/debian/libjakarta-taglibs-standard-java.poms b/debian/libjakarta-taglibs-standard-java.poms deleted file mode 100644 index c238769..0000000 --- a/debian/libjakarta-taglibs-standard-java.poms +++ /dev/null @@ -1 +0,0 @@ -debian/poms/standard.pom --java-lib --artifact=standard/build/standard/standard/lib/standard.jar diff --git a/debian/libjstl1.1-java.classpath b/debian/libjstl1.1-java.classpath deleted file mode 100644 index f4df37b..0000000 --- a/debian/libjstl1.1-java.classpath +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/jstl1.1.jar xalan2.jar diff --git a/debian/libjstl1.1-java.poms b/debian/libjstl1.1-java.poms deleted file mode 100644 index 8067f6f..0000000 --- a/debian/libjstl1.1-java.poms +++ /dev/null @@ -1 +0,0 @@ -debian/poms/jstl.pom --java-lib --usj-name=jstl1.1 --artifact=standard/build/standard/standard/lib/jstl.jar diff --git a/debian/libtaglibs-standard-spec-java.poms b/debian/libtaglibs-standard-spec-java.poms new file mode 100644 index 0000000..5604b3f --- /dev/null +++ b/debian/libtaglibs-standard-spec-java.poms @@ -0,0 +1,34 @@ +# 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 +build-tools/pom.xml --ignore +spec/pom.xml --has-package-version --package=libtaglibs-standard-spec-java --java-lib +impl/pom.xml --has-package-version --package=libtaglibs-standard-impl-java --java-lib +jstlel/pom.xml --has-package-version --package=libtaglibs-standard-jstlel-java --java-lib +compat/pom.xml --ignore +standard-test/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..6058a0c --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,6 @@ + +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * +org.codehaus.mojo javancss-maven-plugin * * * * +org.codehaus.mojo taglist-maven-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..65c567b --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,10 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=false + +maven.compiler.source=1.5 +maven.compiler.target=1.5 + +project.build.sourceEncoding=UTF-8 diff --git a/debian/maven.rules b/debian/maven.rules index 370efd6..b1cfab7 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,3 +1,5 @@ -# Remap JSTL to 1.1 as this is the version of the API -# Implemented -javax.servlet jstl jar s/.*/1.1/ * * + +junit junit jar s/4\..*/4.x/ * * +javax.el s/el-api/javax.el-api/ * s/.*/3.0/ * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * * diff --git a/debian/patches/03-bundle-settings.patch b/debian/patches/03-bundle-settings.patch new file mode 100644 index 0000000..ae3ca74 --- /dev/null +++ b/debian/patches/03-bundle-settings.patch @@ -0,0 +1,54 @@ +Description: Add the missing maven-bundle-plugin settings from the taglibs-parent pom +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/pom.xml ++++ b/pom.xml +@@ -114,4 +114,22 @@ + </build> + </profile> + </profiles> ++ ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.felix</groupId> ++ <artifactId>maven-bundle-plugin</artifactId> ++ <version>2.0.1</version> ++ <extensions>true</extensions> ++ <configuration> ++ <instructions> ++ <Implementation-Title>${project.name}</Implementation-Title> ++ <Implementation-Version>${project.version}</Implementation-Version> ++ <Bundle-DocURL>${project.url}</Bundle-DocURL> ++ </instructions> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> + </project> +--- a/impl/pom.xml ++++ b/impl/pom.xml +@@ -70,6 +70,7 @@ + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-spec</artifactId> + <version>1.2.5</version> ++ <type>bundle</type> + <scope>provided</scope> + </dependency> + +--- a/jstlel/pom.xml ++++ b/jstlel/pom.xml +@@ -71,11 +71,13 @@ + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-spec</artifactId> + <version>1.2.5</version> ++ <type>bundle</type> + </dependency> + <dependency> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-impl</artifactId> + <version>1.2.5</version> ++ <type>bundle</type> + </dependency> + + <dependency> diff --git a/debian/patches/series b/debian/patches/series index af58241..663751c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02-servlet-api-compatibility.patch +03-bundle-settings.patch diff --git a/debian/poms/jstl.pom b/debian/poms/jstl.pom deleted file mode 100644 index 6eb06e0..0000000 --- a/debian/poms/jstl.pom +++ /dev/null @@ -1,14 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file diff --git a/debian/poms/standard.pom b/debian/poms/standard.pom deleted file mode 100644 index d43698a..0000000 --- a/debian/poms/standard.pom +++ /dev/null @@ -1,6 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> -</project> \ No newline at end of file diff --git a/debian/rules b/debian/rules index 8c7ebbf..f62e92c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,10 @@ #!/usr/bin/make -f -export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/el-api-3.0.jar - -DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p') -MAVEN_REPO := http://repo1.maven.org/maven2 - %: - dh $@ --with maven_repo_helper,javahelper + dh $@ --buildsystem=maven override_dh_auto_build: - ant -propertyfile debian/ant.properties -f standard/build.xml - -override_dh_auto_clean: - dh_auto_clean - rm -Rf standard/build + dh_auto_build -- install get-orig-source: uscan --download-current-version --force-download --rename --repack --compression xz - -get-orig-pom: - mkdir -p debian/poms - wget -U NoSuchBrowser/1.0 -O debian/poms/jstl.pom \ - $(MAVEN_REPO)/javax/servlet/jstl/$(DEB_UPSTREAM_VERSION)/jstl-$(DEB_UPSTREAM_VERSION).pom - wget -U NoSuchBrowser/1.0 -O debian/poms/standard.pom \ - $(MAVEN_REPO)/taglibs/standard/$(DEB_UPSTREAM_VERSION)/standard-$(DEB_UPSTREAM_VERSION).pom -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/taglibs-standard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
