Upgrade to Java 11 and parent version 2.0

Author: robtimus

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17, 21]
+        java: [11, 17, 21]
       fail-fast: false
     steps:
       - uses: actions/checkout@v5
@@ -39,7 +39,7 @@ jobs:
       - name: Build with Maven
         run: mvn package --file pom.xml -B --no-transfer-progress
 
-  native-module:
+  site:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
@@ -50,17 +50,4 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn package --file pom.xml -B --no-transfer-progress -Pnative-module
-
-  site:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up JDK 8
-        uses: actions/setup-java@v5
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Build with Maven
-        run: mvn site --file pom.xml -B --no-transfer-progress
+        run: mvn package site --file pom.xml -B --no-transfer-progress -DskipTests

.github/workflows/release-site.yml

@@ -26,15 +26,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
       - name: Build site
         run: |
-          mvn site --file pom.xml -B --no-transfer-progress
+          mvn package site --file pom.xml -B --no-transfer-progress -DskipTests
           for i in `grep '<module>.*</module>' pom.xml`; do
               module=`echo $i | sed 's~<module>\(.*\)</module>~\1~g'`
               echo "Moving site for module $module to target/site"

pom.xml

@@ -22,12 +22,12 @@
   <parent>
     <groupId>com.github.robtimus</groupId>
     <artifactId>robtimus-parent</artifactId>
-    <version>1.18</version>
+    <version>2.0</version>
     <relativePath />
   </parent>
 
   <artifactId>obfuscation-json</artifactId>
-  <version>2.1-SNAPSHOT</version>
+  <version>3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>obfuscation-json</name>
@@ -62,6 +62,8 @@
   </issueManagement>
 
   <properties>
+    <version.java>11</version.java>
+
     <version.json-api>2.1.3</version.json-api>
     <version.json-impl>2.0.1</version.json-impl>
     <version.obfuscation-core>1.5</version.obfuscation-core>
@@ -146,6 +148,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -194,11 +203,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
-
       <plugin>
         <groupId>com.github.robtimus</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -223,6 +227,14 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine}
+            -javaagent:${org.mockito:mockito-core:jar}
+            <!-- Allow JUnit to fully access the test classes -->
+            --add-opens com.github.robtimus.obfuscation.json/com.github.robtimus.obfuscation.json=ALL-UNNAMED
+          </argLine>
+        </configuration>
       </plugin>
 
       <plugin>
@@ -261,54 +273,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>native-module</id>
-      <properties>
-        <version.java>11</version.java>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <!-- Allow JUnit to fully access the test classes -->
-              <argLine>
-                @{argLine}
-                --add-opens com.github.robtimus.obfuscation.json/com.github.robtimus.obfuscation.json=ALL-UNNAMED
-              </argLine>
-            </configuration>
-          </plugin>
-
-          <plugin>
-            <groupId>org.moditect</groupId>
-            <artifactId>moditect-maven-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/moditect</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

src/moditect/module-info.java renamed to src/main/java/module-info.java

@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+/**
+ * Provides functionality for obfuscating JSON using the Java API for Processing JSON (JSR 374).
+ */
 module com.github.robtimus.obfuscation.json {
     requires transitive com.github.robtimus.obfuscation;
     requires jakarta.json;