This is an automated email from the ASF dual-hosted git repository. joerghoh pushed a commit to branch SLING-12591 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit fcd6ec4e2dce4df6c340fcdf71d9d71379e45830 Author: Joerg Hoh <[email protected]> AuthorDate: Thu Dec 19 16:58:27 2024 +0100 update dependencies (missing spotless, failing ITs) --- pom.xml | 254 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 128 insertions(+), 126 deletions(-) diff --git a/pom.xml b/pom.xml index e2d5ab7..5c65396 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>49</version> + <version>62</version> <relativePath /> </parent> @@ -31,18 +31,17 @@ <version>2.11.9-SNAPSHOT</version> <name>Apache Sling Servlets Resolver</name> - <description> - Bundle implementing the Sling API ServletResolver. - </description> + <description>Bundle implementing the Sling API ServletResolver.</description> <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git</developerConnection> + <tag>HEAD</tag> <url>https://github.com/apache/sling-org-apache-sling-servlets-resolver.git</url> - <tag>HEAD</tag> - </scm> + </scm> <properties> + <sling.java.version>11</sling.java.version> <project.build.outputTimestamp>2024-12-19T15:10:18Z</project.build.outputTimestamp> <site.jira.version.id>12314292</site.jira.version.id> <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> @@ -50,123 +49,6 @@ <pax.vm.options>-Xmx512M</pax.vm.options> </properties> - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.bnd.plugin.headers.parameters.remove</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <excludePackageNames> - org.apache.sling.servlets.resolver.internal - </excludePackageNames> - <doclint>none</doclint> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.servicemix.tooling</groupId> - <artifactId>depends-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>4.7.3.6</version> - <configuration> - <effort>Max</effort> - <xmlOutput>true</xmlOutput> - <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile> - </configuration> - <executions> - <execution> - <id>find-bugs</id> - <phase>process-classes</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - <execution> - <id>verify</id> - <phase>integration-test</phase> - <goals> - <goal>verify</goal> - </goals> - </execution> - </executions> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - <systemProperties> - <property> - <name>bundle.filename</name> - <value>${basedir}/target/${project.build.finalName}.jar</value> - </property> - <property> - <name>pax.vm.options</name> - <value>${pax.vm.options}</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.github.spotbugs - </groupId> - <artifactId> - spotbugs-maven-plugin - </artifactId> - <versionRange> - [3.1.11,) - </versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <dependencies> <dependency> <groupId>org.apache.sling</groupId> @@ -256,7 +138,7 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> + <artifactId>org.osgi.framework</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -276,7 +158,12 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> + <artifactId>org.osgi.util.tracker</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -284,6 +171,12 @@ <artifactId>org.apache.felix.healthcheck.api</artifactId> <version>2.0.4</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Testing --> <dependency> @@ -430,4 +323,113 @@ </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <versionRange>[3.1.11,)</versionRange> + <goals> + <goal>check</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.bnd.plugin.headers.parameters.remove</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <excludePackageNames>org.apache.sling.servlets.resolver.internal</excludePackageNames> + <doclint>none</doclint> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <version>4.7.3.6</version> + <configuration> + <effort>Max</effort> + <xmlOutput>true</xmlOutput> + <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile> + </configuration> + <executions> + <execution> + <id>find-bugs</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <systemProperties> + <property> + <name>bundle.filename</name> + <value>${basedir}/target/${project.build.finalName}.jar</value> + </property> + <property> + <name>pax.vm.options</name> + <value>${pax.vm.options}</value> + </property> + </systemProperties> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <phase>integration-test</phase> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project>
