Skip to content

Commit

Permalink
[MRELEASE-1096] Many cleanups and updates
Browse files Browse the repository at this point in the history 
* Upgrade to SLF4J 1.7.36
* Upgrade to JUnit 4.13.2

In ITs:
* Upgrade to Maven Compiler Plugin 3.10.1
* Upgrade to Maven Invoker Plugin 3.2.2
* Upgrade to Plexus Maven Plugin 1.3.8
* Upgrade to Plexus Component Metadata 1.7.1

This closes #132
  • Loading branch information
@nielsbasjes @michael-o
nielsbasjes authored and michael-o committed May 31, 2022
1 parent 9bf8fd2 commit 281b680
Show file tree
Hide file tree
Showing 50 changed files with 75 additions and 181 deletions.
16 changes: 1 addition & 15 deletions maven-release-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-api</artifactId>
<version>3.0.0-M6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -274,18 +274,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>reporting</id>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>1.3.8</version>
</plugin>
</plugins>
</reporting>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions maven-release-manager/src/test/resources/pomfinder/pom1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junitVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -193,7 +193,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>1.3.8</version>
<version>@plexusMavenPluginVersion@</version>

This comment has been minimized.

Sign in to view

Copy link
@hboutemy

hboutemy Jun 1, 2022 •
edited
Loading

Member

I don't get why this complexification is added to sample pom.xml files that are used to check transformations: it's src/test/resources
is there real execution done during tests?

This comment has been minimized.

Sign in to view

Copy link
@michael-o

michael-o Jun 1, 2022

Member

That was my question too. I would expect a follow-up clarification.
<executions>
<execution>
<id>create-component-descriptor</id>
Expand Down
2 changes: 1 addition & 1 deletion ...generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...sources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ts/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion .../resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...es/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
28 changes: 1 addition & 27 deletions ...nager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.2</version>
<version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
Expand Down Expand Up @@ -125,32 +125,6 @@
</execution>
</executions>
</plugin>
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>it-preparation</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<pomFile>${basedir}/pom.xml</pomFile>
<createChecksum>true</createChecksum>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
<localRepositoryId>local</localRepositoryId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
28 changes: 1 addition & 27 deletions ...elease-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.2</version>
<version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
Expand Down Expand Up @@ -127,32 +127,6 @@
</execution>
</executions>
</plugin>
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>it-preparation</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<pomFile>${basedir}/pom.xml</pomFile>
<createChecksum>true</createChecksum>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
<localRepositoryId>local</localRepositoryId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion ...s/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion .../resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...rces/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ger/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...al-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...nt/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...jects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...urces/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...esources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...esources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
28 changes: 1 addition & 27 deletions ...ager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.2</version>
<version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
Expand Down Expand Up @@ -125,32 +125,6 @@
</execution>
</executions>
</plugin>
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>it-preparation</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<pomFile>${basedir}/pom.xml</pomFile>
<createChecksum>true</createChecksum>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
<localRepositoryId>local</localRepositoryId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
28 changes: 1 addition & 27 deletions ...lease-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.2</version>
<version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
Expand Down Expand Up @@ -127,32 +127,6 @@
</execution>
</executions>
</plugin>
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>it-preparation</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<pomFile>${basedir}/pom.xml</pomFile>
<createChecksum>true</createChecksum>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
<localRepositoryId>local</localRepositoryId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
Loading

0 comments on commit 281b680

Please sign in to comment.