Merge pull request #2525 from hazendaz/master

Build updates
Waffle · Sep 14, 2024 · ff47a88 · ff47a88
2 parents 0003070 + 8b763ec
commit ff47a88
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
@@ -25,6 +25,7 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.waffle</groupId>
@@ -156,7 +157,7 @@
         <maven.compiler.testTarget>${java.test.version}</maven.compiler.testTarget>
         <maven.compiler.testRelease>${java.test.release.version}</maven.compiler.testRelease>
 
-        <maven.min-version>3.9.8</maven.min-version>
+        <maven.min-version>3.9.9</maven.min-version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>

diff --git a/Source/JNA/waffle-distro/pom.xml b/Source/JNA/waffle-distro/pom.xml
@@ -293,7 +293,7 @@
                             <enforceBytecodeVersion>
                                 <excludes>
                                     <!-- Openssl contains panama for jdk 22 or higher if enabled via listener 'org.apache.catalina.core.OpenSSLLifecycleListener' -->
-                                    <exclude>org.apache.tomcat:tomcat-coyote</exclude>
+                                    <exclude>org.apache.tomcat:tomcat-coyote-ffm</exclude>
                                     <exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
                                 </excludes>
                             </enforceBytecodeVersion>

diff --git a/Source/JNA/waffle-tomcat10/pom.xml b/Source/JNA/waffle-tomcat10/pom.xml
@@ -128,7 +128,7 @@
                             <enforceBytecodeVersion>
                                 <excludes>
                                     <!-- Openssl contains panama for jdk 22 or higher if enabled via listener 'org.apache.catalina.core.OpenSSLLifecycleListener' -->
-                                    <exclude>org.apache.tomcat:tomcat-coyote</exclude>
+                                    <exclude>org.apache.tomcat:tomcat-coyote-ffm</exclude>
                                 </excludes>
                             </enforceBytecodeVersion>
                         </rules>

diff --git a/Source/JNA/waffle-tomcat11/pom.xml b/Source/JNA/waffle-tomcat11/pom.xml
@@ -128,7 +128,7 @@
                             <enforceBytecodeVersion>
                                 <excludes>
                                     <!-- Openssl contains panama for jdk 22 or higher if enabled via listener 'org.apache.catalina.core.OpenSSLLifecycleListener' -->
-                                    <exclude>org.apache.tomcat:tomcat-coyote</exclude>
+                                    <exclude>org.apache.tomcat:tomcat-coyote-ffm</exclude>
                                 </excludes>
                             </enforceBytecodeVersion>
                         </rules>