[Git][java-team/tomcat-jakartaee-migration][upstream] New upstream version 1.0.8

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Tue Jul 9 09:42:55 BST 2024



Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / tomcat-jakartaee-migration


Commits:
537f6cdd by Emmanuel Bourg at 2024-07-09T10:22:57+02:00
New upstream version 1.0.8
- - - - -


5 changed files:

- CHANGES.md
- NOTICE.txt
- pom.xml
- src/main/java/org/apache/tomcat/jakartaee/Migration.java
- src/main/java/org/apache/tomcat/jakartaee/TextConverter.java


Changes:

=====================================
CHANGES.md
=====================================
@@ -1,5 +1,14 @@
 # Tomcat Migration Tool for Jakarta EE - Changelog
 
+## 1.0.8
+- Include `.ear` files in list of recognised archives. PR[#50](https://github.com/apache/tomcat-jakartaee-migration/pull/50) provided by Sammy Chu. (markt)
+- Update Commons BCEL to 6.8.1. (markt)
+- Update Commons Compress to 1.25.0. (markt)
+- Update Commons IO to 2.15.1. (markt)
+- Update Ant to 1.10.14. (markt)
+- Include `.jspf` and `.tagf` files in the conversion process. (markt)
+
+
 ## 1.0.7
 
 - When converting directories, rename files according to the chosen profile. (fschumacher)


=====================================
NOTICE.txt
=====================================
@@ -1,5 +1,5 @@
 Apache Tomcat migration tool for Jakarta EE
-Copyright 2020-2022 The Apache Software Foundation
+Copyright 2020-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
\ No newline at end of file


=====================================
pom.xml
=====================================
@@ -21,12 +21,12 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>27</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.tomcat</groupId>
   <artifactId>jakartaee-migration</artifactId>
-  <version>1.0.7</version>
+  <version>1.0.8</version>
   <name>Apache Tomcat Migration Tool for Jakarta EE</name>
 
   <description>The aim of the tool is to take a web application written for Java EE 8 that
@@ -62,7 +62,7 @@
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git</developerConnection>
-    <tag>1.0.7</tag>
+    <tag>1.0.8</tag>
     <url>https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git</url>
   </scm>
 
@@ -77,22 +77,22 @@
     <dependency>
       <groupId>org.apache.bcel</groupId>
       <artifactId>bcel</artifactId>
-      <version>6.7.0</version>
+      <version>6.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.23.0</version>
+      <version>1.25.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.11.0</version>
+      <version>2.15.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.12</version>
+      <version>1.10.14</version>
       <scope>provided</scope>
     </dependency>
 
@@ -141,7 +141,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>create-test-jars</id>
@@ -204,7 +203,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -232,7 +230,6 @@
              org.apache.maven.plugins ...which is assumed by default.
          -->
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.4.2</version>
         <executions>
           <execution>
             <id>make-assembly</id>
@@ -323,7 +320,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.2.0</version>
         <configuration>
           <configLocation>src/checkstyle/checkstyle.xml</configLocation>
           <headerLocation>src/checkstyle/header-al2.txt</headerLocation>


=====================================
src/main/java/org/apache/tomcat/jakartaee/Migration.java
=====================================
@@ -304,7 +304,7 @@ public class Migration {
                 ZipArchiveOutputStream destZipStream = new ZipArchiveOutputStream(CloseShieldOutputStream.wrap(dest))) {
             ZipArchiveEntry srcZipEntry;
             CRC32 crc32 = new CRC32();
-            while ((srcZipEntry = srcZipStream.getNextZipEntry()) != null) {
+            while ((srcZipEntry = srcZipStream.getNextEntry()) != null) {
                 String srcName = srcZipEntry.getName();
                 if (isSignatureFile(srcName)) {
                     logger.log(Level.WARNING, sm.getString("migration.skipSignatureFile", srcName));
@@ -413,7 +413,8 @@ public class Migration {
     }
 
     private boolean isArchive(String fileName) {
-        return fileName.endsWith(".jar") || fileName.endsWith(".war") || fileName.endsWith(".zip");
+        return fileName.endsWith(".jar") || fileName.endsWith(".war") || fileName.endsWith(".ear") ||
+                fileName.endsWith(".zip");
     }
 
 


=====================================
src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
=====================================
@@ -40,8 +40,10 @@ public class TextConverter implements Converter {
         supportedExtensions = new ArrayList<>();
         supportedExtensions.add("java");
         supportedExtensions.add("jsp");
+        supportedExtensions.add("jspf");
         supportedExtensions.add("jspx");
         supportedExtensions.add("tag");
+        supportedExtensions.add("tagf");
         supportedExtensions.add("tagx");
         supportedExtensions.add("tld");
         supportedExtensions.add("txt");



View it on GitLab: https://salsa.debian.org/java-team/tomcat-jakartaee-migration/-/commit/537f6cdda036a2a8764859a9e4cd45bdd83a8195

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/tomcat-jakartaee-migration/-/commit/537f6cdda036a2a8764859a9e4cd45bdd83a8195
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/20240709/6520057c/attachment.htm>


More information about the pkg-java-commits mailing list