This is an automated email from the ASF dual-hosted git repository.

lprimak pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/3.x by this push:
     new b1a7b8fee chore: add profiles for JDK 21 and JDK 25, update bundle 
plugin dependencies to properly support multi-release JARs in preparation for 
scoped value support
b1a7b8fee is described below

commit b1a7b8feede4548dc36a322d0d20fded605f7bc7
Author: lprimak <[email protected]>
AuthorDate: Sun Jan 25 11:52:58 2026 -0600

    chore: add profiles for JDK 21 and JDK 25, update bundle plugin 
dependencies to properly support multi-release JARs in preparation for scoped 
value support
---
 pom.xml | 87 +++++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7403e8dd2..55101eba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,14 @@
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>5.1.9</version>
+                    <dependencies>
+                        <!-- Required to upgrade bnd in the 
maven-bundle-plugin to be able to handle Multi-Release jars -->
+                        <dependency>
+                            <groupId>biz.aQute.bnd</groupId>
+                            <artifactId>biz.aQute.bndlib</artifactId>
+                            <version>7.2.1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -580,30 +588,6 @@
                         </annotationProcessorPath>
                     </annotationProcessorPaths>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>jdk21-compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <multiReleaseOutput>true</multiReleaseOutput>
-                            <release>21</release>
-                            
<compileSourceRoots>${project.build.sourceDirectory}21</compileSourceRoots>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jdk25-compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <multiReleaseOutput>true</multiReleaseOutput>
-                            <release>25</release>
-                            
<compileSourceRoots>${project.build.sourceDirectory}25</compileSourceRoots>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -1631,6 +1615,61 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>jdk-21</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jdk21-compile</id>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    
<multiReleaseOutput>true</multiReleaseOutput>
+                                    <release>21</release>
+                                    
<compileSourceRoots>${project.build.sourceDirectory}21</compileSourceRoots>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk-25</id>
+            <activation>
+                <jdk>[25,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jdk25-compile</id>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    
<multiReleaseOutput>true</multiReleaseOutput>
+                                    <release>25</release>
+                                    
<compileSourceRoots>${project.build.sourceDirectory}25</compileSourceRoots>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>docs</id>
             <build>

Reply via email to