Skip to content

Commit

Permalink
Upgrade versions of all Maven dependencies and plugins (pull #731)
Browse files Browse the repository at this point in the history
  • Loading branch information
archenroot authored Jan 30, 2024
1 parent 9012a1f commit 7a2c518
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.6.1</version>
<executions>
<execution>
<id>properties</id>
Expand All @@ -214,7 +214,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<configuration>
<attach>false</attach>
<descriptors>
Expand All @@ -233,7 +233,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>default-jar</id>
Expand Down Expand Up @@ -268,7 +268,7 @@
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>1.0.0.RC2</version>
<version>1.1.0</version>
<configuration>
<jvmVersion>9</jvmVersion>
<overwriteExistingFiles>true</overwriteExistingFiles>
Expand Down Expand Up @@ -318,7 +318,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand Down Expand Up @@ -375,7 +375,7 @@
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMddhhmm</maven.build.timestamp.format>
<maven.version>3.0</maven.version>
<bnd.version>5.3.0</bnd.version>
<maven.version>3.9.0</maven.version>
<bnd.version>6.4.0</bnd.version>
<javacpp.platform.root></javacpp.platform.root>
<javacpp.platform.suffix></javacpp.platform.suffix>
<javacpp.platform.compiler></javacpp.platform.compiler>
Expand Down Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>7.0.0</version>
<version>8.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
<version>3.9.0</version>
<configuration>
<packagingTypes>
<packagingType>jar</packagingType>
Expand All @@ -146,15 +146,15 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.12.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.2.5</version>
<configuration>
<systemProperties>
<property>
Expand Down Expand Up @@ -187,7 +187,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<!-- Pull in the bnd generated manifest -->
Expand Down Expand Up @@ -218,7 +218,7 @@
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>1.0.0.RC2</version>
<version>1.1.0</version>
<configuration>
<jvmVersion>9</jvmVersion>
<overwriteExistingFiles>true</overwriteExistingFiles>
Expand All @@ -244,14 +244,14 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.1</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<configuration>
<attach>false</attach>
<descriptors>
Expand All @@ -270,7 +270,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-source</id>
Expand All @@ -282,7 +282,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -312,7 +312,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand Down Expand Up @@ -406,7 +406,7 @@ Import-Package: \
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -438,7 +438,7 @@ Import-Package: \
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.1</version>
<executions>
<execution>
<phase>process-classes</phase>
Expand Down Expand Up @@ -553,7 +553,7 @@ Import-Package: \
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.2</version>
<version>3.6.0</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/integration-test/projects</cloneProjectsTo>
<cloneClean>true</cloneClean>
Expand Down
6 changes: 3 additions & 3 deletions src/it/osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>Integration Tests for JavaCPP running in OSGi</description>

<properties>
<bnd.version>5.3.0</bnd.version>
<bnd.version>6.4.0</bnd.version>
<lib.path>${os.name}-${os.arch}/${lib.name}</lib.path>
</properties>

Expand Down Expand Up @@ -158,13 +158,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>6.0.5</version>
<version>7.0.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions src/it/osgi/test.bndrun
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
-runrequires: bnd.identity;id='javacpp-tests-osgi'
-runfw: org.apache.felix.framework;version='[6.0.5,6.0.5]'
-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
-runee: JavaSE-1.8
-runbundles: \
org.bytedeco.javacpp;version='0.0.0',\
org.bytedeco.javacpp.${os.name}-${os.arch};version='0.0.0',\
javacpp-tests-osgi;version='0.0.0',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
slf4j.api;version='[1.7.32,1.7.33)',\
slf4j.simple;version='[1.7.32,1.7.33)'
slf4j.api;version='[1.7.36,1.7.37)',\
slf4j.simple;version='[1.7.36,1.7.37)'

0 comments on commit 7a2c518

Please sign in to comment.