Skip to content

Commit

Permalink
Merge pull request #181 from ebarboni/versionbump
Browse files Browse the repository at this point in the history 
versions upgrade keep jdk8 + maven 3
  • Loading branch information
@ebarboni
ebarboni authored Jul 25, 2024
2 parents c6570b1 + 177e0d9 commit 7027d7c
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
9 changes: 7 additions & 2 deletions nb-repository-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.1</version>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -108,7 +113,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>2.0.13</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
27 changes: 18 additions & 9 deletions nbm-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,23 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.1</version>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.9.2</version>
<version>4.10.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>3.4.2</version>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>3.0.1</version>
</dependency>

<dependency><!-- use harness from NetBeans 13.0 -->
<groupId>${project.groupId}</groupId>
<artifactId>nbm-maven-harness</artifactId>
Expand Down Expand Up @@ -129,12 +133,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
<version>1.13.2</version>
<version>1.14.1</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
Expand All @@ -158,6 +162,11 @@ under the License.
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -214,7 +223,7 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>2.3.0</version>
<version>2.4.0</version>
<executions>
<execution>
<id>build</id>
Expand Down Expand Up @@ -273,12 +282,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
<version>5</version>
<version>6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.6.1</version>
<version>3.7.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
51 changes: 35 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
<!-- <mojo.java.target>1.6</mojo.java.target> -->
<maven.version>3.9.6</maven.version>
<maven.minimum.version>3.6.3</maven.minimum.version>
<maven.plugin.version>3.12.0</maven.plugin.version>
<maven.plugin.version>3.13.0</maven.plugin.version>
<skin.groupId>org.apache.maven.skins</skin.groupId>
<skin.artifactId>maven-fluido-skin</skin.artifactId>
<skin.version>1.12.0</skin.version>
<netbeans.version>RELEASE210</netbeans.version>
<netbeans.version>RELEASE220</netbeans.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -102,31 +102,50 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.7.1</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.7.0</version>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.minimum.version}</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
Expand All @@ -140,7 +159,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.23</version>
<version>1.24</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
Expand All @@ -151,7 +170,7 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
<headerLocation>config/maven-header.txt</headerLocation>
Expand All @@ -160,7 +179,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
<version>5</version>
<version>6</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand All @@ -172,11 +191,11 @@
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<version>3.24.0</version>
<configuration>
<targetJdk>1.8</targetJdk>
</configuration>
Expand All @@ -197,19 +216,19 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.2</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.3</version>
<version>3.6.0</version>
</plugin>
<plugin>
<artifactId>maven-plugin-report-plugin</artifactId>
Expand All @@ -218,7 +237,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<tagListOptions>
<tagClasses>
Expand Down

0 comments on commit 7027d7c

Please sign in to comment.