Skip to content

Commit

Permalink
#1115 Update dependencies and plugins to latest working versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@oliverlietz
oliverlietz committed Mar 21, 2024
1 parent b926568 commit 7b8170d
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 43 deletions.
4 changes: 2 additions & 2 deletions core/pax-exam/src/main/resources/META-INF/pax-exam-version.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pax.exam.version=${pom.version}
pax.url.version=${dependency.paxurl.version}
pax.url.version=${dependency.pax.url.version}
pax.runner.version=${dependency.paxrunner.version}
ops4j.base.version=${dependency.base.version}
pax.swissbox.version=${dependency.swissbox.version}
pax.tinybundles.version=${dependency.tinybundles.version}
atinject.version=${dependency.atinject.version}
atinject.version=${dependency.atinject.version}
2 changes: 1 addition & 1 deletion itest/osgi/src/it/regression-testng-perclass/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- For sane logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion itest/osgi/src/it/regression-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- For sane logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>

Expand Down
99 changes: 60 additions & 39 deletions pom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,23 @@

<properties>
<namespace>org.ops4j.pax.exam</namespace>
<dependency.paxurl.version>2.6.8</dependency.paxurl.version>
<dependency.pax.logging.version>1.10.3</dependency.pax.logging.version>
<dependency.pax.url.version>2.6.14</dependency.pax.url.version>
<dependency.pax.logging.version>2.1.4</dependency.pax.logging.version>
<dependency.swissbox.version>1.8.3</dependency.swissbox.version>
<dependency.tinybundles.version>4.0.0</dependency.tinybundles.version>
<dependency.base.version>1.5.1</dependency.base.version>
<dependency.slf4j.version>1.7.25</dependency.slf4j.version>
<dependency.slf4j.version>1.7.36</dependency.slf4j.version>
<dependency.junit.version>4.13.2</dependency.junit.version>
<dependency.openwebbeans.version>2.0.27</dependency.openwebbeans.version>
<dependency.osgicore.version>8.0.0</dependency.osgicore.version>
<dependency.asm.version>3.0</dependency.asm.version>
<dependency.atinject.version>1.0.5</dependency.atinject.version>
<dependency.deltaspike.version>1.9.6</dependency.deltaspike.version>
<dependency.glassfish.version>5.1.0</dependency.glassfish.version>
<dependency.karaf.version>4.4.4</dependency.karaf.version>

<dependency.logback.version>1.2.3</dependency.logback.version>
<dependency.logback.version>1.2.12</dependency.logback.version>

<dependency.maven.version>3.0.5</dependency.maven.version>
<dependency.maven.version>3.9.6</dependency.maven.version>
<dependency.spring.version>5.3.30</dependency.spring.version>
<dependency.testng.version>7.8.0</dependency.testng.version>
<dependency.org.apache.servicemix.bundles.hamcrest.version>1.3_1</dependency.org.apache.servicemix.bundles.hamcrest.version>
Expand All @@ -59,7 +58,7 @@
<version>11</version>
</requireJavaVersion>
<requireMavenVersion>
<version>(3.0.0,)</version>
<version>3.9.6</version>
<message>This project requires Maven 3</message>
</requireMavenVersion>
<DependencyConvergence />
Expand Down Expand Up @@ -103,7 +102,7 @@

<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.4</version>
<version>3.2.0</version>
<executions>
<execution>
<id>process-remote-resources</id>
Expand Down Expand Up @@ -136,14 +135,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand All @@ -169,6 +169,18 @@
<artifactId>maven-invoker-plugin</artifactId>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
<version>3.3.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
Expand All @@ -177,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.10.2</version>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -219,7 +231,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>

<dependency>
Expand All @@ -231,7 +243,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.8.2</version>
<version>1.9.26</version>
</dependency>

<dependency>
Expand All @@ -249,7 +261,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.10.2</version>
<version>3.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -288,17 +300,22 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-classpath</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-reference</artifactId>
<version>${dependency.pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.base</groupId>
Expand Down Expand Up @@ -395,17 +412,17 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>${dependency.asm.version}</version>
<version>9.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<version>1.26.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.13.0</version>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand All @@ -429,7 +446,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<artifactId>slf4j-reload4j</artifactId>
<version>${dependency.slf4j.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -487,13 +504,13 @@
<dependency>
<groupId>org.jboss.classfilewriter</groupId>
<artifactId>jboss-classfilewriter</artifactId>
<version>1.3.0.Final</version>
<version>1.3.1.Final</version>
</dependency>

<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>2.4.4.Final</version>
<version>3.1.7</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -640,15 +657,19 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.3.6.Final</version>
<version>5.6.15.Final</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.2.2</version>
<scope>test</scope>
<version>10.14.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.14.2.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -691,25 +712,25 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.15</version>
<version>3.5.1</version>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.4</version>
<version>2.8.0</version>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>2.1.1</version>
<version>2.2.0</version>
</dependency>

<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
<version>3.0.3.GA</version>
<version>3.8.13.Final</version>
</dependency>

<dependency>
Expand All @@ -721,13 +742,13 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
<version>1.16.1</version>
</dependency>

<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.7</version>
<version>1.6</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -787,13 +808,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2.1</version>
<version>3.14.0</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0</version>
<version>33.1.0-jre</version>
</dependency>

<dependency>
Expand All @@ -811,13 +832,13 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.9.1</version>
<version>2.41</version>
</dependency>

<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.12.1.GA</version>
<version>3.29.2.GA</version>
</dependency>

<!-- Apache HTTP Client Dependencies -->
Expand Down Expand Up @@ -1011,12 +1032,12 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-reference</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -1037,7 +1058,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${dependency.paxurl.version}</version>
<version>${dependency.pax.url.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down Expand Up @@ -1076,7 +1097,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>2.7.1</version>
<version>3.11.0.3922</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
5 changes: 5 additions & 0 deletions samples/pax-exam-sample6-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
<artifactId>derby</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
Expand Down

0 comments on commit 7b8170d

Please sign in to comment.