Skip to content
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

Bump org.codehaus.plexus:plexus from 14 to 15 #375

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Bump org.codehaus.plexus:plexus from 14 to 15 #375

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
b9a7666
Bump org.codehaus.plexus:plexus from 14 to 15
dependabot[bot] Oct 4, 2023
0931681
Remove redundant config after parent update
slachiewicz Oct 4, 2023
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
1 change: 0 additions & 1 deletion modello-maven-plugin/src/it/clone-java5/invoker.properties
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/clone-java5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/clone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 0 additions & 2 deletions modello-maven-plugin/src/it/javadoc/invoker.properties
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions modello-maven-plugin/src/it/javadoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<artifactId>junit</artifactId>
<version>@junitVersion@</version>
</dependency>

<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
Expand Down Expand Up @@ -52,8 +52,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/maven-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
1 change: 0 additions & 1 deletion modello-maven-plugin/src/it/snakeyaml/invoker.properties
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/snakeyaml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>@java.version@</source>
<target>@java.version@</target>
<source>@javaVersion@</source>
<target>@javaVersion@</target>
</configuration>
</plugin>
<plugin>
Expand Down
126 changes: 5 additions & 121 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
<version>14</version>
<version>15</version>
</parent>

<groupId>org.codehaus.modello</groupId>
Expand Down Expand Up @@ -220,18 +220,16 @@
</distributionManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jackson.version>2.15.2</jackson.version>
<jdom.version>2.0.2</jdom.version>
<surefire.version>3.1.2</surefire.version>
<maven.version>3.5.4</maven.version>
<!--
! This controls the minimum java version
! and also the version which is used
! in the integration tests.
-->
<java.version>1.8</java.version>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2023-06-06T22:23:45Z</project.build.outputTimestamp>
</properties>

Expand Down Expand Up @@ -375,55 +373,6 @@
<pluginManagement>
<plugins>
<!-- set versions of common plugins for reproducibility, ordered alphabetically -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<!-- <configLocation>config/maven_checks.xml</configLocation>-->
<!-- <headerLocation>config/maven-header.txt</headerLocation>-->
<skip>true</skip>
<failOnViolation>false</failOnViolation>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
<!-- 10.x requires Java 11 -->
</dependency>
<!-- replace with Plexus own checkstyle definitions -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
<version>5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -437,7 +386,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>${java.version}</version>
<version>${javaVersion}</version>
</requireJavaVersion>
<requireMavenVersion>
<version>${maven.version}</version>
Expand All @@ -447,16 +396,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -478,11 +417,6 @@
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.5</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
Expand All @@ -492,44 +426,6 @@
<releaseProfiles>modello-release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<pubScmUrl>${project.scm.developerConnection}</pubScmUrl>
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<skipDeploy>true</skipDeploy>
<!-- don't deploy site with maven-site-plugin -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-verifier-plugin</artifactId>
Expand Down Expand Up @@ -573,10 +469,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
<offline>true</offline>
</configuration>
</plugin>
</plugins>
</reporting>
Expand Down Expand Up @@ -743,24 +635,16 @@
</reporting>
</profile>

<!-- TODO remove with parent pom or spotless plugin update https://github.com/diffplug/spotless/issues/1774 -->
<profile>
<id>java21+</id>
<id>java11+</id>
<activation>
<jdk>[21,)</jdk>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<configuration>
<java>
<palantirJavaFormat>
<version>2.35.0</version>
</palantirJavaFormat>
</java>
</configuration>
</plugin>
</plugins>
</build>
Expand Down