#4 Upgrade 3rd party library, support Java 17

amosshi · May 1, 2022 · d60d552 · d60d552
1 parent bfdf18a
commit d60d552
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 23 deletions.
diff --git a/...CLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java b/...CLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java
@@ -29,7 +29,7 @@
  * @author Amos Shi
  * @see
  * <a href="https://docs.oracle.com/javase/specs/jvms/se17/html/jvms-4.html#jvms-4.4.5">
- * VM Spec: The CONSTANT_Double_info Structure
+ * VM Spec: The CONSTANT_Double_info Structure</a>
  *
  * <pre>
  * java:S101 - Class names should comply with a naming convention --- We respect the name from JVM Spec instead

diff --git a/FormatELF/src/main/java/org/freeinternals/format/elf/Identification.java b/FormatELF/src/main/java/org/freeinternals/format/elf/Identification.java
@@ -56,14 +56,14 @@ public class Identification extends FileComponent implements GenerateTreeNode {
     /**
      * Magic number of ELF file: <code>0x7F454C46</code>.
      *
-     * @see {@link #MAGIC_NUMBER}
+     * @see #MAGIC_NUMBER
      */
     public final int EI_MAG;
 
     /**
      * ELF classification: 32- or 64-bit.
      *
-     * @see {@link ElfClass}
+     * @see ElfClass
      */
     public final ElfClass EI_CLASS;
 
@@ -75,7 +75,7 @@ public class Identification extends FileComponent implements GenerateTreeNode {
     /**
      * Little or big endianness.
      *
-     * @see {@link Endianness}
+     * @see Endianness
      */
     public final Endianness EI_DATA;
 

diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java
@@ -21,7 +21,7 @@ public class MarkerParse {
      * @param pDisFile Data Input Stream for <code>file</code> byte array
      * @return The generated proper marker instance
      * @throws IOException
-     * @throws JPEGFileFormatException
+     * @throws FileFormatException
      */
     public static Marker parse(final PosDataInputStream pDisFile) throws IOException, FileFormatException {
         Marker marker;

diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java
@@ -40,7 +40,7 @@ public class IFD extends FileComponent {
      * @param startPosTiff
      * @param byteArrayTiff
      * @throws IOException
-     * @throws JPEGFileFormatException 
+     * @throws FileFormatException
      */
     protected IFD(final PosDataInputStream pDIS, int byteOrder, int tag, int type, int startPosTiff, byte[] byteArrayTiff) throws IOException, FileFormatException {
         super.startPos = pDIS.getPos() - 4;

diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Analysis.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Analysis.java
@@ -102,7 +102,7 @@ public FileComponent parseNextObject(PosDataInputStream stream, List<FileCompone
      * /BitsPerComponent 4
      * /Length 347
      * /Filter 8 0 R
-     * </pre> </p> When we found the '
+     * </pre> When we found the '
      * <code>R</code>', we need to merge the former
      * <code>8</code> and
      * <code>0</code> together with the

diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_pHYs.java b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_pHYs.java
@@ -27,10 +27,10 @@ public class Chunk_pHYs extends Chunk {
     public final int AxisY;
     /**
      * Unit specifier.
-     * <p><pre>
+     * <pre>
      * 0: unit is unknown
      * 1: unit is the meter
-     * </pre></p>
+     * </pre>
      */
     public final int Unit;
 

diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_tRNS.java b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_tRNS.java
@@ -95,12 +95,12 @@ public class Chunk_tRNS extends Chunk {
      * For color type 3 (indexed color), the <span>tRNS</span> chunk contains
      * a series of one-byte alpha values, corresponding to entries in the
      * <span>PLTE</span> chunk:
+     * </p>
      * <pre>
      *    Alpha for palette index 0:  1 byte
      *    Alpha for palette index 1:  1 byte
      *    ...etc...
      * </pre>
-     * </p>
      * <p>
      * Each entry indicates that pixels of the corresponding palette index must
      * be treated as having the specified alpha value.

diff --git a/build.sh b/build.sh
@@ -7,10 +7,13 @@
 
 # System default java on Ubuntu LTS Linux
 export JAVA_HOME=/usr/lib/jvm/default-java
+#export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 
 # System default java on openSUSE Linux
 #export JAVA_HOME=/usr/lib64/jvm/java
 
+java -version
+
 mvn  clean package install
 mvn  javadoc:aggregate
 mvn  jdeps:jdkinternals

diff --git a/format-class.sh b/format-class.sh
@@ -3,7 +3,11 @@
 # Build one format only
 #
 
+
 export JAVA_HOME=/usr/lib/jvm/default-java
+#export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+java -version
+
 mvn  --projects CommonLib,FormatCLASS,BinaryInternalsViewer  clean package install
 
 cd BinaryInternalsViewer/target/

diff --git a/pom.xml b/pom.xml
@@ -40,9 +40,9 @@
 
     <properties>
         <maven.compiler.release>11</maven.compiler.release>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-jar-plugin -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotbugs.version>4.4.2</spotbugs.version>
+        <spotbugs.version>4.6.0</spotbugs.version><!-- https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-annotations -->
 
         <revision>3.5</revision>
     </properties>
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
                 <configuration>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
@@ -75,12 +75,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-checkstyle-plugin -->
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>9.0.1</version>
+                        <version>10.2</version><!-- https://mvnrepository.com/artifact/com.puppycrawl.tools/checkstyle -->
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -109,7 +109,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.1.3</version>
+                <version>4.6.0.0</version><!-- https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-maven-plugin -->
                 <dependencies>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
@@ -137,14 +137,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <additionalJOption>-J-Xmx4g </additionalJOption>
                     <additionalOptions>-html5</additionalOptions>
                     <aggregate>true</aggregate>
                     <detectJavaApiLink>true</detectJavaApiLink>
                     <detectLinks>true</detectLinks>
-                    <footer>Free Internals</footer>
+                    <doclint>all,-missing</doclint><!-- Ignore Javadoc warning as of now -->
                     <header>Free Internals &lt;br&gt; Free Tools to View Internals of Binary File</header>
                     <show>private</show>
                     <links>
@@ -163,7 +163,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.1</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -178,13 +178,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.9.1</version>
+                <version>3.12.0</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-site-plugin -->
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
+                <version>2.8.2</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-deploy-plugin -->
                 <executions>
                     <execution>
                         <id>default-deploy</id>
@@ -200,7 +200,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.1.0</version>
+                <version>1.2.7</version><!-- https://mvnrepository.com/artifact/org.codehaus.mojo/flatten-maven-plugin -->
                 <configuration>
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>resolveCiFriendliesOnly</flattenMode>
@@ -252,4 +252,4 @@
         <!-- Libs on hold -->
         <module>FormatPDF</module>
     </modules>
-</project>
+</project>