Skip to content

Bump org.apache:apache from 39 to 40 #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien11689 merged 2 commits into from
Sep 22, 2026
+117 −97
Merged

Bump org.apache:apache from 39 to 40 #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cab5bf
Bump org.apache:apache from 39 to 40
dependabot[bot] Sep 22, 2026
e6aeeab
MAINTENANCE: Add profiles for java 8 and 11 to stay on rat plugin 0.17
alien11689 Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 47 additions & 29 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>39</version>
<version>40</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -538,41 +538,41 @@
</execution>
</executions>
<configuration>
<reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
<outputFile>${project.build.directory}/${project.build.finalName}.rat</outputFile>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>**/target/**/*</exclude>
<exclude>**/appended-resources/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/velocity.log</exclude>
<exclude>**/DEPENDENCIES</exclude>
<inputExcludes>
<inputExclude>**/target/**/*</inputExclude>
<inputExclude>**/appended-resources/**/*</inputExclude>
<inputExclude>**/dependency-reduced-pom.xml</inputExclude>
<inputExclude>**/velocity.log</inputExclude>
<inputExclude>**/DEPENDENCIES</inputExclude>
<!-- exclude IntelliJ IDEA generated files -->
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
<exclude>**/.idea/**/*</exclude>
<inputExclude>**/*.iml</inputExclude>
<inputExclude>**/*.ipr</inputExclude>
<inputExclude>**/*.iws</inputExclude>
<inputExclude>**/.idea/**/*</inputExclude>
<!-- exclude Eclipse IDE generated files -->
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/eclipse-classes/**/*</exclude>
<inputExclude>**/.project</inputExclude>
<inputExclude>**/.classpath</inputExclude>
<inputExclude>**/.settings/**</inputExclude>
<inputExclude>**/eclipse-classes/**/*</inputExclude>
<!-- manifest files don't support comments so don't contain the ASL2.0 header -->
<exclude>**/*.MF</exclude>
<inputExclude>**/*.MF</inputExclude>
<!--RAT doesn't seem to recognize MIT style licenses-->
<exclude>manual/src/styles/print.css</exclude>
<inputExclude>manual/src/styles/print.css</inputExclude>
<!-- RAT doesn't recognize BSD license in transaction-manager logger -->
<exclude>**/objectweb/howl/log/Logger.java</exclude>
<inputExclude>**/objectweb/howl/log/Logger.java</inputExclude>
<!--RAT doesn't seem to recognize W3C license -->
<exclude>**/xml.xsd</exclude>
<exclude>.gitignore</exclude>
<exclude>README.md</exclude>
<exclude>**/*.cfg</exclude>
<exclude>**/*.sausages</exclude>
<exclude>**/README.md</exclude>
<exclude>**/Readme.md</exclude>
<exclude>**/NOTICE.vm</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
</excludes>
<inputExclude>**/xml.xsd</inputExclude>
<inputExclude>.gitignore</inputExclude>
<inputExclude>README.md</inputExclude>
<inputExclude>**/*.cfg</inputExclude>
<inputExclude>**/*.sausages</inputExclude>
<inputExclude>**/README.md</inputExclude>
<inputExclude>**/Readme.md</inputExclude>
<inputExclude>**/NOTICE.vm</inputExclude>
<inputExclude>**/dependency-reduced-pom.xml</inputExclude>
</inputExcludes>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -617,6 +617,24 @@
</plugins>
</build>
</profile>
<profile>
<id>java8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<version.apache-rat-plugin>0.17</version.apache-rat-plugin>
</properties>
</profile>
<profile>
<id>java9to16</id>
<activation>
<jdk>(8,17)</jdk>
</activation>
<properties>
<version.apache-rat-plugin>0.17</version.apache-rat-plugin>
</properties>
</profile>
</profiles>

<reporting>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>39</version>
<version>40</version>
</parent>

<!-- This pom is for convenience in building several aries subprojects at once.
Expand Down
2 changes: 1 addition & 1 deletion pushstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>39</version>
<version>40</version>
<relativePath/>
</parent>

Expand Down
134 changes: 68 additions & 66 deletions spi-fly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>39</version>
<version>40</version>
<relativePath />
</parent>

Expand All @@ -49,7 +49,6 @@
<maven.compiler.target>8</maven.compiler.target>
<java.source.version>8</java.source.version>

<apache-rat-plugin.version>0.17</apache-rat-plugin.version>
<asm.version>9.10.1</asm.version>
<assertj.version>3.27.7</assertj.version>
<bnd.version>6.4.1</bnd.version>
Expand Down Expand Up @@ -120,7 +119,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<optimize>true</optimize>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
Expand Down Expand Up @@ -206,6 +204,59 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<outputFile>${project.build.directory}/${project.build.finalName}.rat</outputFile>
<excludeSubProjects>false</excludeSubProjects>
<inputExcludes>
<inputExclude>**/target/**/*</inputExclude>
<inputExclude>**/appended-resources/**/*</inputExclude>
<inputExclude>**/dependency-reduced-pom.xml</inputExclude>
<inputExclude>**/velocity.log</inputExclude>
<inputExclude>**/DEPENDENCIES</inputExclude>
<!-- exclude IntelliJ IDEA generated files -->
<inputExclude>**/*.iml</inputExclude>
<inputExclude>**/*.ipr</inputExclude>
<inputExclude>**/*.iws</inputExclude>
<inputExclude>**/.idea/**/*</inputExclude>
<!-- exclude Eclipse IDE generated files -->
<inputExclude>**/.project</inputExclude>
<inputExclude>**/.classpath</inputExclude>
<inputExclude>**/.settings/**</inputExclude>
<inputExclude>**/.vscode/settings.json</inputExclude>
<inputExclude>**/eclipse-classes/**/*</inputExclude>
<!-- manifest files don't support comments so don't contain the ASL2.0 header -->
<inputExclude>**/*.MF</inputExclude>
<!--RAT doesn't seem to recognize MIT style licenses-->
<inputExclude>manual/src/styles/print.css</inputExclude>
<!-- RAT doesn't recognize BSD license in transaction-manager logger -->
<inputExclude>**/objectweb/howl/log/Logger.java</inputExclude>
<!--RAT doesn't seem to recognize W3C license -->
<inputExclude>**/xml.xsd</inputExclude>
<inputExclude>.gitignore</inputExclude>
<inputExclude>changelog.md</inputExclude>
<inputExclude>README.md</inputExclude>
<inputExclude>*.cfg</inputExclude>
<inputExclude>**/README.md</inputExclude>
<inputExclude>**/Readme.md</inputExclude>
<inputExclude>**/NOTICE.vm</inputExclude>
<inputExclude>**/dependency-reduced-pom.xml</inputExclude>
<inputExclude>**/src/main/resources/META-INF/services/*</inputExclude>
<inputExclude>**/src/main/resources/org/apache/aries/spifly/test/blah.txt</inputExclude>
<inputExclude>tck/apply-to-tck.sh</inputExclude>
</inputExcludes>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -215,9 +266,6 @@
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<!-- <maven.compiler.release>${java.specification.version}</maven.compiler.release> -->
</properties>
<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -247,68 +295,22 @@
</build>
</profile>
<profile>
<id>rat</id>
<id>java8</id>
<activation>
<activeByDefault>true</activeByDefault>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${apache-rat-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>**/target/**/*</exclude>
<exclude>**/appended-resources/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/velocity.log</exclude>
<exclude>**/DEPENDENCIES</exclude>
<!-- exclude IntelliJ IDEA generated files -->
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
<exclude>**/.idea/**/*</exclude>
<!-- exclude Eclipse IDE generated files -->
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/.vscode/settings.json</exclude>
<exclude>**/eclipse-classes/**/*</exclude>
<!-- manifest files don't support comments so don't contain the ASL2.0 header -->
<exclude>**/*.MF</exclude>
<!--RAT doesn't seem to recognize MIT style licenses-->
<exclude>manual/src/styles/print.css</exclude>
<!-- RAT doesn't recognize BSD license in transaction-manager logger -->
<exclude>**/objectweb/howl/log/Logger.java</exclude>
<!--RAT doesn't seem to recognize W3C license -->
<exclude>**/xml.xsd</exclude>
<exclude>.gitignore</exclude>
<exclude>changelog.md</exclude>
<exclude>README.md</exclude>
<exclude>*.cfg</exclude>
<exclude>**/README.md</exclude>
<exclude>**/Readme.md</exclude>
<exclude>**/NOTICE.vm</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/src/main/resources/META-INF/services/*</exclude>
<exclude>**/src/main/resources/org/apache/aries/spifly/test/blah.txt</exclude>
<exclude>tck/apply-to-tck.sh</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<version.apache-rat-plugin>0.17</version.apache-rat-plugin>
</properties>
</profile>
<profile>
<id>java9to16</id>
<activation>
<jdk>(8,17)</jdk>
</activation>
<properties>
<version.apache-rat-plugin>0.17</version.apache-rat-plugin>
</properties>
</profile>
</profiles>
</project>
Loading