Bumped to jdk25

apache-commons-modeler.spec

@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          46%{?dist}
+Release:          48%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -15,7 +15,7 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
 # POM file based on the one from an unreleased upstream snapstream
 Source1:          pom.xml
 
-BuildRequires:  maven-local-openjdk21
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(commons-digester:commons-digester)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -55,7 +55,7 @@ cp -p %{SOURCE1} .
 
 # Fix ant dependency
 %pom_remove_dep ant:ant
-%pom_add_dep org.apache.ant:ant:1.8
+%pom_add_dep org.apache.ant:ant:1.10
 
 %mvn_alias : org.apache.commons:%{short_name}
 %mvn_file : %{name} %{short_name}

pom.xml

@@ -197,6 +197,37 @@
           </ignorePathsToDelete>
         </configuration>
       </plugin>
+<!-- copied from parent to be modified-->
+          <plugin>
+            <groupId>org.moditect</groupId>
+            <artifactId>moditect-maven-plugin</artifactId>
+            <version>${commons.moditect-maven-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>add-module-infos</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>add-module-info</goal>
+                </goals>
+                <configuration>
+                  <jvmVersion>${moditect.java.version}</jvmVersion>
+                  <jdepsExtraArgs>
+<!-- added config--><arg>--ignore-missing-deps</arg> <!-- added config-->
+                    <arg>--multi-release=${moditect.java.version}</arg>
+                  </jdepsExtraArgs>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <overwriteExistingFiles>true</overwriteExistingFiles>
+                  <failOnWarning>false</failOnWarning>
+                  <module>
+                    <moduleInfo>
+                      <name>${commons.module.name}</name>
+                      <addServiceUses>${commons.moditect-maven-plugin.addServiceUses}</addServiceUses>
+                    </moduleInfo>
+                  </module>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
     </plugins>
   </build>