From d60d552013846b3870dcf717ce84928aa173dafd Mon Sep 17 00:00:00 2001 From: amosshi Date: Sat, 30 Apr 2022 21:56:42 -0700 Subject: [PATCH] #4 Upgrade 3rd party library, support Java 17 --- .../constant/CONSTANT_Double_info.java | 2 +- .../format/elf/Identification.java | 6 ++--- .../format/jpeg/MarkerParse.java | 2 +- .../freeinternals/format/jpeg/tiff/IFD.java | 2 +- .../format/pdf/basicobj/Analysis.java | 2 +- .../freeinternals/format/png/Chunk_pHYs.java | 4 +-- .../freeinternals/format/png/Chunk_tRNS.java | 2 +- build.sh | 3 +++ format-class.sh | 4 +++ pom.xml | 26 +++++++++---------- 10 files changed, 30 insertions(+), 23 deletions(-) diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java index cc9a771..cade566 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CONSTANT_Double_info.java @@ -29,7 +29,7 @@ * @author Amos Shi * @see * - * VM Spec: The CONSTANT_Double_info Structure + * VM Spec: The CONSTANT_Double_info Structure * * 
  * 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
index be9a1cd..f85c5f3 100644
--- 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: 0x7F454C46.
      *
-     * @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
index 37a8d64..8e85750 100644
--- 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 file 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
index 95dbb03..06dca82 100644
--- 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
index 290678f..f5b94e9 100644
--- 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 
 When we found the '
+     *
When we found the ' * R', we need to merge the former * 8 and * 0 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 index 79b1edd..6127ab1 100644 --- 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. - * 

+     * 
      * 0: unit is unknown
      * 1: unit is the meter
-     * 

+     *
*/ 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 index be7eb94..1f416b4 100644 --- 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 tRNS chunk contains * a series of one-byte alpha values, corresponding to entries in the * PLTE chunk: + *

* 
      *    Alpha for palette index 0:  1 byte
      *    Alpha for palette index 1:  1 byte
      *    ...etc...
      *
- *

*

* 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 index 5ca6308..0dac20f 100755 --- 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 index 41ae988..eabfc5c 100755 --- 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 index 7b00023..bcb63ec 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ 11 - 3.2.0 + 3.2.2 UTF-8 - 4.4.2 + 4.6.0 3.5 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 true true @@ -75,12 +75,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 com.puppycrawl.tools checkstyle - 9.0.1 + 10.2 @@ -109,7 +109,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.1.3 + 4.6.0.0 com.github.spotbugs @@ -137,14 +137,14 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.0 -J-Xmx4g -html5 true true true -

+ all,-missing
Free Internals <br> Free Tools to View Internals of Binary File
private @@ -163,7 +163,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.2.1 attach-sources @@ -178,13 +178,13 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.12.0 org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 2.8.2 default-deploy @@ -200,7 +200,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.1.0 + 1.2.7 true resolveCiFriendliesOnly @@ -252,4 +252,4 @@ FormatPDF - + \ No newline at end of file