Merge branch 'master' into doxia2

apache · Dec 6, 2024 · 5622e98 · 5622e98
2 parents eb10ad7 + b679a70
commit 5622e98
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -957,7 +957,8 @@ under the License.
     <version.plexus-utils>4.0.1</version.plexus-utils>
     <!-- DO NOT UPGRADE to 4: incompatible with Maven 3 -->
     <version.plexus-xml>3.0.1</version.plexus-xml>
-    <versions.junit5>5.10.3</versions.junit5>
+    <versions.junit5>5.11.3</versions.junit5>
+    <version.maven-fluido-skin>1.12.0</version.maven-fluido-skin>
     <version.maven-shared-resources>6</version.maven-shared-resources>
     <project.build.outputTimestamp>2024-07-04T20:44:45Z</project.build.outputTimestamp>
 
@@ -1198,7 +1199,7 @@ under the License.
         <plugin>
           <groupId>com.diffplug.spotless</groupId>
           <artifactId>spotless-maven-plugin</artifactId>
-          <version>2.43.0</version>
+          <version>2.44.0.BETA4</version>
           <configuration>
             <java>
               <!-- orders of used formatters are important MPOM-376 -->
@@ -1217,6 +1218,7 @@ under the License.
                 <expandEmptyElements>false</expandEmptyElements>
                 <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
                 <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                <quiet>true</quiet>
               </sortPom>
             </pom>
             <upToDateChecking>
@@ -1363,7 +1365,7 @@ under the License.
           <plugin>
             <groupId>org.cyclonedx</groupId>
             <artifactId>cyclonedx-maven-plugin</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0</version>
             <executions>
               <execution>
                 <goals>
@@ -1380,7 +1382,7 @@ under the License.
       <id>format-check</id>
       <activation>
         <property>
-          <name>!format</name>
+          <name>env.CI</name>
         </property>
       </activation>
       <properties>
@@ -1391,7 +1393,7 @@ under the License.
       <id>format</id>
       <activation>
         <property>
-          <name>format</name>
+          <name>!env.CI</name>
         </property>
       </activation>
       <properties>