[Git][java-team/tomcat9][master] 2 commits: Simplified the Maven rules

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tomcat9


Commits:
60283679 by Emmanuel Bourg at 2022-09-28T09:28:00+02:00
Simplified the Maven rules

- - - - -
cf561740 by Emmanuel Bourg at 2022-09-29T14:59:21+02:00
Look for OpenJDK 17 and up to 21 when starting the server (Closes: #1020948)

- - - - -


3 changed files:

- debian/changelog
- debian/libexec/tomcat-locate-java.sh
- debian/maven.rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tomcat9 (9.0.67-2) UNRELEASED; urgency=medium
+
+  * Look for OpenJDK 17 and up to 21 when starting the server (Closes: #1020948)
+  * Simplified the Maven rules
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 28 Sep 2022 09:27:38 +0200
+
 tomcat9 (9.0.67-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/libexec/tomcat-locate-java.sh
=====================================
@@ -13,7 +13,7 @@ if [ -z "$JAVA_HOME" ]; then
     # This function sets the variable JDK_DIRS
     find_jdks()
     {
-        for java_version in 11 10 9 8
+        for java_version in 21 20 19 17 11 8
         do
             for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
                           /usr/lib/jvm/jdk-${java_version}-oracle-* \


=====================================
debian/maven.rules
=====================================
@@ -1,37 +1,6 @@
 # Publish 9.x instead of 'debian' artifacts to avoid conflicts with other versions of Tomcat
 org.apache.tomcat tomcat                     * s/.*/9.x/
-org.apache.tomcat tomcat-annotations-api     * s/.*/9.x/
-org.apache.tomcat tomcat-api                 * s/.*/9.x/
-org.apache.tomcat tomcat-catalina            * s/.*/9.x/
-org.apache.tomcat tomcat-catalina-ant        * s/.*/9.x/
-org.apache.tomcat tomcat-catalina-ha         * s/.*/9.x/
-org.apache.tomcat tomcat-catalina-jmx-remote * s/.*/9.x/
-org.apache.tomcat tomcat-catalina-ws         * s/.*/9.x/
-org.apache.tomcat tomcat-coyote              * s/.*/9.x/
-org.apache.tomcat tomcat-dbcp                * s/.*/9.x/
-org.apache.tomcat tomcat-el-api              * s/.*/9.x/
-org.apache.tomcat tomcat-i18n-es             * s/.*/9.x/
-org.apache.tomcat tomcat-i18n-fr             * s/.*/9.x/
-org.apache.tomcat tomcat-i18n-ja             * s/.*/9.x/
-org.apache.tomcat tomcat-i18n-ru             * s/.*/9.x/
-org.apache.tomcat tomcat-jasper              * s/.*/9.x/
-org.apache.tomcat tomcat-jasper-el           * s/.*/9.x/
-org.apache.tomcat tomcat-jaspic-api          * s/.*/9.x/
-org.apache.tomcat tomcat-jdbc                * s/.*/9.x/
-org.apache.tomcat tomcat-jni                 * s/.*/9.x/
-org.apache.tomcat tomcat-jsp-api             * s/.*/9.x/
-org.apache.tomcat tomcat-juli                * s/.*/9.x/
-org.apache.tomcat tomcat-servlet-api         * s/.*/9.x/
-org.apache.tomcat tomcat-storeconfig         * s/.*/9.x/
-org.apache.tomcat tomcat-tribes              * s/.*/9.x/
-org.apache.tomcat tomcat-util                * s/.*/9.x/
-org.apache.tomcat tomcat-util-scan           * s/.*/9.x/
-org.apache.tomcat tomcat-websocket           * s/.*/9.x/
-org.apache.tomcat tomcat-websocket-api       * s/.*/9.x/
+org.apache.tomcat tomcat-*                   * s/.*/9.x/
+org.apache.tomcat.embed tomcat-embed-*       * s/.*/9.x/
 
 org.eclipse.jdt s/ecj/org.eclipse.jdt.core/  * s/.*/debian/
-
-org.apache.tomcat.embed tomcat-embed-core      * s/.*/9.x/
-org.apache.tomcat.embed tomcat-embed-el        * s/.*/9.x/
-org.apache.tomcat.embed tomcat-embed-jasper    * s/.*/9.x/
-org.apache.tomcat.embed tomcat-embed-websocket * s/.*/9.x/



View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/4fae4db5e13ceef4547db87672519adcdba9e22a...cf5617405f9a67552e87c8397e19dcc043766f9f

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/4fae4db5e13ceef4547db87672519adcdba9e22a...cf5617405f9a67552e87c8397e19dcc043766f9f
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/20220929/ee8a1fd5/attachment.htm>