Merge branch 'main' into scratch/jakarta

OWASP · Jul 30, 2024 · 1abaa3e · 1abaa3e
2 parents 23849de + 2f151ce
commit 1abaa3e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 4 deletions.
diff --git a/core/src/main/java9/module-info.java b/core/src/main/java9/module-info.java
@@ -0,0 +1,3 @@
+module owasp.encoder {
+    exports org.owasp.encoder;
+}
diff --git a/esapi/src/main/java9/module-info.java b/esapi/src/main/java9/module-info.java
@@ -0,0 +1,5 @@
+module owasp.encoder.esapi {
+    requires owasp.encoder;
+
+    exports org.owasp.encoder.esapi;
+}
diff --git a/jakarta/src/main/java9/module-info.java b/jakarta/src/main/java9/module-info.java
@@ -0,0 +1,5 @@
+module owasp.encoder.jakarta {
+    requires owasp.encoder;
+
+    exports org.owasp.encoder.tag;
+}
diff --git a/jsp/src/main/java9/module-info.java b/jsp/src/main/java9/module-info.java
@@ -0,0 +1,5 @@
+module owasp.encoder.jsp {
+    requires owasp.encoder;
+
+    exports org.owasp.encoder.tag;
+}
diff --git a/pom.xml b/pom.xml
@@ -168,7 +168,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -242,7 +242,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -266,9 +266,42 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile-java-8</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-java-9</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>9</release>
+                            <compileSourceRoots> 
+                                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot> 
+                            </compileSourceRoots> 
+                            <multiReleaseOutput>true</multiReleaseOutput>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <archive>
+                        <manifestEntries>
+                            <Multi-Release>true</Multi-Release>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>