#14 Release 3.6 after Java 21

amosshi · amosshi · commit 61d8ebae494b · 2023-09-22T00:54:50.000-07:00
diff --git a/BinaryInternalsViewer/pom.xml b/BinaryInternalsViewer/pom.xml
@@ -25,37 +25,37 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.bmp</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.jpeg</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.zip</artifactId>
-            <version>0.7</version>
+            <version>0.8</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.pdf</artifactId>
-            <version>0.5</version>
+            <version>0.6</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.dex</artifactId>
-            <version>0.7</version>
+            <version>0.8</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.elf</artifactId>
-            <version>0.2</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>binaryinternals.format.png</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
     </dependencies>
 
diff --git a/BinaryInternalsViewer/src/assembly/bin.xml b/BinaryInternalsViewer/src/assembly/bin.xml
@@ -32,5 +32,4 @@
             </includes>
         </fileSet>
     </fileSets>
-    <!-- TODO change output directory -->
 </assembly>
diff --git a/BinaryInternalsViewer/src/main/java/module-info.java b/BinaryInternalsViewer/src/main/java/module-info.java
@@ -17,4 +17,8 @@
 module org.binaryinternals.app {
     requires static com.github.spotbugs.annotations;
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.app;
+    exports org.binaryinternals.binaryviewer;
+    exports org.binaryinternals.plugin;
 }
diff --git a/CommonLib/src/main/java/module-info.java b/CommonLib/src/main/java/module-info.java
@@ -22,7 +22,7 @@
     requires transitive java.desktop;
     requires transitive java.logging;
     requires static com.github.spotbugs.annotations;
-    
+
     exports org.binaryinternals.commonlib.core;
     exports org.binaryinternals.commonlib.ui;
 }
diff --git a/FormatBMP/pom.xml b/FormatBMP/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.bmp</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatBMP</name>
diff --git a/FormatBMP/src/main/java/module-info.java b/FormatBMP/src/main/java/module-info.java
@@ -16,4 +16,6 @@
 
 module org.binaryinternals.formatbmp {
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.bmp;
 }
diff --git a/FormatDEX/pom.xml b/FormatDEX/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.dex</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatDEX</name>
diff --git a/FormatDEX/src/main/java/module-info.java b/FormatDEX/src/main/java/module-info.java
@@ -17,4 +17,6 @@
 module org.binaryinternals.formatdex {
     requires static org.binaryinternals.commonlib;
     requires static org.binaryinternals.formatclass;
+
+    exports org.binaryinternals.format.dex;
 }
diff --git a/FormatELF/pom.xml b/FormatELF/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.elf</artifactId>
-    <version>0.2</version>
+    <version>0.3</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatELF</name>
diff --git a/FormatELF/src/main/java/module-info.java b/FormatELF/src/main/java/module-info.java
@@ -16,4 +16,6 @@
 
 module org.binaryinternals.formatelf {
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.elf;
 }
diff --git a/FormatJPEG/pom.xml b/FormatJPEG/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.jpeg</artifactId>
-    <version>2.0</version>
+    <version>2.1</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatJPEG</name>
diff --git a/FormatJPEG/src/main/java/module-info.java b/FormatJPEG/src/main/java/module-info.java
@@ -17,4 +17,10 @@
 module org.binaryinternals.formatjpeg {
     requires static com.github.spotbugs.annotations;
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.jpeg;
+    exports org.binaryinternals.format.jpeg.icc;
+    exports org.binaryinternals.format.jpeg.ps;
+    exports org.binaryinternals.format.jpeg.tiff;
+    exports org.binaryinternals.format.jpeg.xmp;
 }
diff --git a/FormatPDF/pom.xml b/FormatPDF/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.pdf</artifactId>
-    <version>0.5</version>
+    <version>0.6</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatPDF</name>
diff --git a/FormatPDF/src/main/java/module-info.java b/FormatPDF/src/main/java/module-info.java
@@ -16,4 +16,7 @@
 
 module org.binaryinternals.formatpdf {
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.pdf;
+    exports org.binaryinternals.format.pdf.basicobj;
 }
diff --git a/FormatPNG/pom.xml b/FormatPNG/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.png</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatPNG</name>
diff --git a/FormatPNG/src/main/java/module-info.java b/FormatPNG/src/main/java/module-info.java
@@ -16,4 +16,6 @@
 
 module org.binaryinternals.formatpng {
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.png;
 }
diff --git a/FormatZIP/pom.xml b/FormatZIP/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>binaryinternals.format.zip</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <name>binaryinternals :: FormatZIP</name>
diff --git a/FormatZIP/src/main/java/module-info.java b/FormatZIP/src/main/java/module-info.java
@@ -16,4 +16,6 @@
 
 module org.binaryinternals.formatzip {
     requires static org.binaryinternals.commonlib;
+
+    exports org.binaryinternals.format.zip;
 }
diff --git a/README.md b/README.md
@@ -44,7 +44,11 @@ Build the Source Code
   * Build Tool: `Apache Maven 3.6` or higher: because we are using the [Maven CI Friendly Versions](https://maven.apache.org/maven-ci-friendly.html) `${revision}` feature
 * Build
   * Build via maven command
-    * `mvn clean package install`
+    * `mvn clean`
+    * `mvn package`
+    * `mvn install`
+    * `mvn site:site`
+    * `mvn site:stage`
   * Build with Script
     * `./build.sh` (Linux/MacOS/Windows Git Bash)
     * `build.cmd` (Windows CMD)
@@ -61,3 +65,8 @@ Structure
 Legacy note
 
 * The original `Java Class Viewer` has been retired and merged into `Binary Internals Viewer` since Apr 2021
+
+
+## Standalone Libs
+
+The `FormatXXXX.jar` files can be used in your project when needed.
diff --git a/build.sh b/build.sh
@@ -21,8 +21,11 @@
 
 java -version
 
-mvn  clean package install
-mvn  dependency:tree versions:display-dependency-updates
+mvn  clean
+mvn  package
+mvn  install
+mvn  dependency:tree
+mvn  versions:display-dependency-updates
 #mvn source:aggregate javadoc:aggregate javadoc:aggregate-jar pdf:aggregate checkstyle:checkstyle-aggregate pmd:aggregate-pmd site:site site:deploy 
 #mvn jdeps:jdkinternals
 #mvn spotbugs:gui
diff --git a/pom.xml b/pom.xml
@@ -39,17 +39,22 @@
     </scm>
 
     <properties>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <revision>3.6</revision>
 
         <buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version><!-- https://mvnrepository.com/artifact/org.codehaus.mojo/buildnumber-maven-plugin -->
         <git-commit-id-maven-plugin.version>6.0.0</git-commit-id-maven-plugin.version><!-- https://mvnrepository.com/artifact/io.github.git-commit-id/git-commit-id-maven-plugin -->
         <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-assembly-plugin -->
+        <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-checkstyle-plugin -->
         <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-dependency-plugin -->
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-jar-plugin -->
         <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
+        <maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-jxr-plugin -->
         <maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-pmd-plugin -->
+        <maven-surefire-report-plugin.version>3.1.2</maven-surefire-report-plugin.version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-report-plugin -->
         <spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version><!-- https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-maven-plugin -->
         <spotbugs.version>4.7.3</spotbugs.version><!-- https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-annotations -->
     </properties>
@@ -241,7 +246,7 @@
                     <header>Binary Internals &lt;br&gt; View Internals of Binary File</header>
                     <show>private</show>
                     <links>
-                        <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
+                        <link>https://docs.oracle.com/en/java/javase/17/docs/api</link>
                     </links>
                 </configuration>
                 <executions>
@@ -258,7 +263,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
+                <version>3.3.0</version><!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -377,14 +382,40 @@
                 </reportSets>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>${maven-jxr-plugin.version}</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>                
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${maven-checkstyle-plugin.version}</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>checkstyle</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <version>${spotbugs-maven-plugin.version}</version>
                 <configuration>
                     <xmlOutput>true</xmlOutput>
-                    <!-- Optional directory to put spotbugs xdoc xml report -->
-                    <xmlOutputDirectory>target/site</xmlOutputDirectory>
                 </configuration>
             </plugin>
 
@@ -414,6 +445,11 @@
                 </reportSets>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>${maven-surefire-report-plugin.version}</version>
+            </plugin>
         </plugins>
     </reporting>
 

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,8 @@`
`17`	`17`	`module org.binaryinternals.app {`
`18`	`18`	`requires static com.github.spotbugs.annotations;`
`19`	`19`	`requires static org.binaryinternals.commonlib;`
	`20`	`+`
	`21`	`+ exports org.binaryinternals.app;`
	`22`	`+ exports org.binaryinternals.binaryviewer;`
	`23`	`+ exports org.binaryinternals.plugin;`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`requires transitive java.desktop;`
`23`	`23`	`requires transitive java.logging;`
`24`	`24`	`requires static com.github.spotbugs.annotations;`
`25`		`-`
	`25`	`+`
`26`	`26`	`exports org.binaryinternals.commonlib.core;`
`27`	`27`	`exports org.binaryinternals.commonlib.ui;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@`
`16`	`16`
`17`	`17`	`module org.binaryinternals.formatbmp {`
`18`	`18`	`requires static org.binaryinternals.commonlib;`
	`19`	`+`
	`20`	`+ exports org.binaryinternals.format.bmp;`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,6 @@`
`17`	`17`	`module org.binaryinternals.formatdex {`
`18`	`18`	`requires static org.binaryinternals.commonlib;`
`19`	`19`	`requires static org.binaryinternals.formatclass;`
	`20`	`+`
	`21`	`+ exports org.binaryinternals.format.dex;`
`20`	`22`	`}`