[Git][java-team/el-api][master] 4 commits: Use a real pom for the 3.0 artifacts to improve the compatibility with Gradle and Ivy

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / el-api


Commits:
8f02b7c1 by Emmanuel Bourg at 2018-12-27T22:01:34Z
Use a real pom for the 3.0 artifacts to improve the compatibility with Gradle and Ivy

- - - - -
0b2165d1 by Emmanuel Bourg at 2018-12-27T22:06:10Z
libel-api-java also Breaks/Replaces libservlet2.5-java (Closes: #917273)

- - - - -
a16d0419 by Emmanuel Bourg at 2018-12-27T22:07:49Z
Standards-Version updated to 4.3.0

- - - - -
27177e91 by Emmanuel Bourg at 2018-12-27T22:18:05Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libel-api-java.poms
- + debian/maven.rules.compat
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+el-api (3.0.0-2) unstable; urgency=medium
+
+  * Use a real pom for the 3.0 artifacts to improve the compatibility
+    with Gradle and Ivy
+  * libel-api-java also Breaks/Replaces libservlet2.5-java (Closes: #917273)
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 27 Dec 2018 23:17:57 +0100
+
 el-api (3.0.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #916343)


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
  default-jdk,
  libmaven-bundle-plugin-java (>= 3.5.1),
  maven-debian-helper (>= 2.1)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/el-api.git
 Vcs-Browser: https://salsa.debian.org/java-team/el-api
 Homepage: https://github.com/javaee/el-spec/
@@ -17,8 +17,8 @@ Package: libel-api-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Suggests: ${maven:OptionalDepends}
-Breaks: libservlet3.1-java (<< 8.5.35-3~)
-Replaces: libservlet3.1-java (<< 8.5.35-3~)
+Breaks: libservlet3.1-java (<< 8.5.35-3~), libservlet2.5-java
+Replaces: libservlet3.1-java (<< 8.5.35-3~), libservlet2.5-java
 Description: Expression Language API
  EL is a simple language designed to meet the needs of the presentation
  layer in Java web applications.


=====================================
debian/libel-api-java.poms
=====================================
@@ -25,4 +25,4 @@
 #   --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 --usj-name=el-api --relocate=javax.el:javax.el-api:3.0,javax.el:el-api
+pom.xml --no-parent --has-package-version --usj-name=el-api --relocate=javax.el:el-api


=====================================
debian/maven.rules.compat
=====================================
@@ -0,0 +1,2 @@
+
+javax.el javax.el-api jar s/.*/3.0/


=====================================
debian/rules
=====================================
@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
\ No newline at end of file
+	dh $@
+
+override_dh_auto_install:
+	# Install the old javax.el:javax.el-api:3.0 artifacts
+	mh_installpom -plibel-api-java --no-parent --set-version=3.0 --rules=debian/maven.rules.compat pom.xml
+	rm -Rf debian/libel-api-java/usr/share/maven-repo/javax/el/javax.el-api/debian/
+	dh_link -plibel-api-java /usr/share/java/el-api.jar usr/share/maven-repo/javax/el/javax.el-api/3.0/javax.el-api-3.0.jar
+
+	dh_auto_install



View it on GitLab: https://salsa.debian.org/java-team/el-api/compare/b1f6efd2744b94c9900221634b4f90be9fc74f54...27177e9195b0390b41b1c649de90b7da3a915438

-- 
View it on GitLab: https://salsa.debian.org/java-team/el-api/compare/b1f6efd2744b94c9900221634b4f90be9fc74f54...27177e9195b0390b41b1c649de90b7da3a915438
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181227/bea9e9c5/attachment.html>