Skip to content

Commit 281b680

Browse files
nielsbasjesmichael-o
authored andcommitted
[MRELEASE-1096] Many cleanups and updates
* 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
1 parent 9bf8fd2 commit 281b680

File tree

50 files changed

+75
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+75
-181
lines changed

maven-release-manager/pom.xml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.apache.maven.release</groupId>
3737
<artifactId>maven-release-api</artifactId>
38-
<version>3.0.0-M6-SNAPSHOT</version>
38+
<version>${project.version}</version>
3939
</dependency>
4040

4141
<dependency>
@@ -274,18 +274,4 @@
274274
</plugins>
275275
</build>
276276

277-
<profiles>
278-
<profile>
279-
<id>reporting</id>
280-
<reporting>
281-
<plugins>
282-
<plugin>
283-
<groupId>org.codehaus.plexus</groupId>
284-
<artifactId>plexus-maven-plugin</artifactId>
285-
<version>1.3.8</version>
286-
</plugin>
287-
</plugins>
288-
</reporting>
289-
</profile>
290-
</profiles>
291277
</project>

maven-release-manager/src/test/resources/pomfinder/pom1.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<dependency>
123123
<groupId>junit</groupId>
124124
<artifactId>junit</artifactId>
125-
<version>3.8.2</version>
125+
<version>${junitVersion}</version>
126126
<scope>test</scope>
127127
</dependency>
128128
<dependency>
@@ -193,7 +193,7 @@
193193
<plugin>
194194
<groupId>org.codehaus.plexus</groupId>
195195
<artifactId>plexus-maven-plugin</artifactId>
196-
<version>1.3.8</version>
196+
<version>@plexusMavenPluginVersion@</version>
197197
<executions>
198198
<execution>
199199
<id>create-component-descriptor</id>

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ under the License.
6767
<dependency>
6868
<groupId>junit</groupId>
6969
<artifactId>junit</artifactId>
70-
<version>3.8.1</version>
70+
<version>@junitVersion@</version>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>junit</groupId>
3030
<artifactId>junit</artifactId>
31-
<version>3.8.1</version>
31+
<version>@junitVersion@</version>
3232
<scope>test</scope>
3333
</dependency>
3434
</dependencies>

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ under the License.
6767
<dependency>
6868
<groupId>junit</groupId>
6969
<artifactId>junit</artifactId>
70-
<version>3.8.1</version>
70+
<version>@junitVersion@</version>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>junit</groupId>
3030
<artifactId>junit</artifactId>
31-
<version>3.8.1</version>
31+
<version>@junitVersion@</version>
3232
<scope>test</scope>
3333
</dependency>
3434
</dependencies>

maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ under the License.
6767
<dependency>
6868
<groupId>junit</groupId>
6969
<artifactId>junit</artifactId>
70-
<version>3.8.1</version>
70+
<version>@junitVersion@</version>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>

maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>junit</groupId>
3131
<artifactId>junit</artifactId>
32-
<version>3.8.1</version>
32+
<version>@junitVersion@</version>
3333
<scope>test</scope>
3434
</dependency>
3535
</dependencies>

maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-invoker-plugin</artifactId>
95-
<version>1.2</version>
95+
<version>${mavenInvokerPluginVersion}</version>
9696
<configuration>
9797
<projectsDirectory>src/it</projectsDirectory>
9898
<pomIncludes>
@@ -125,32 +125,6 @@
125125
</execution>
126126
</executions>
127127
</plugin>
128-
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
129-
<plugin>
130-
<groupId>org.apache.maven.plugins</groupId>
131-
<artifactId>maven-install-plugin</artifactId>
132-
<executions>
133-
<execution>
134-
<id>it-preparation</id>
135-
<phase>pre-integration-test</phase>
136-
<goals>
137-
<goal>install-file</goal>
138-
</goals>
139-
<configuration>
140-
<file>${project.build.directory}/${project.build.finalName}.jar</file>
141-
<groupId>${project.groupId}</groupId>
142-
<artifactId>${project.artifactId}</artifactId>
143-
<version>${project.version}</version>
144-
<packaging>${project.packaging}</packaging>
145-
<pomFile>${basedir}/pom.xml</pomFile>
146-
<createChecksum>true</createChecksum>
147-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
148-
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
149-
<localRepositoryId>local</localRepositoryId>
150-
</configuration>
151-
</execution>
152-
</executions>
153-
</plugin>
154128
</plugins>
155129
</build>
156130
</profile>

maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<plugin>
9595
<groupId>org.apache.maven.plugins</groupId>
9696
<artifactId>maven-invoker-plugin</artifactId>
97-
<version>1.2</version>
97+
<version>${mavenInvokerPluginVersion}</version>
9898
<configuration>
9999
<projectsDirectory>src/it</projectsDirectory>
100100
<pomIncludes>
@@ -127,32 +127,6 @@
127127
</execution>
128128
</executions>
129129
</plugin>
130-
<!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-install-plugin</artifactId>
134-
<executions>
135-
<execution>
136-
<id>it-preparation</id>
137-
<phase>pre-integration-test</phase>
138-
<goals>
139-
<goal>install-file</goal>
140-
</goals>
141-
<configuration>
142-
<file>${project.build.directory}/${project.build.finalName}.jar</file>
143-
<groupId>${project.groupId}</groupId>
144-
<artifactId>${project.artifactId}</artifactId>
145-
<version>${project.version}</version>
146-
<packaging>${project.packaging}</packaging>
147-
<pomFile>${basedir}/pom.xml</pomFile>
148-
<createChecksum>true</createChecksum>
149-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
150-
<!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
151-
<localRepositoryId>local</localRepositoryId>
152-
</configuration>
153-
</execution>
154-
</executions>
155-
</plugin>
156130
</plugins>
157131
</build>
158132
</profile>

0 commit comments

Comments
 (0)