Skip to content

Commit

Permalink
[MCOMPILER-585] Refresh plugins versions in ITs
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Mar 13, 2024
1 parent ceacf68 commit eebad60
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 25 deletions.
1 change: 0 additions & 1 deletion src/it/MCOMPILER-170/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
# under the License.

invoker.goals = clean compile -T4
invoker.maven.version = 3.0+
2 changes: 0 additions & 2 deletions src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@

invoker.java.version = 1.8+
invoker.toolchain.jdk.version=1.9
# Due to toolchain support
invoker.maven.version = 3.3.1+
1 change: 0 additions & 1 deletion src/it/MCOMPILER-298/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.8+
invoker.goals = test
4 changes: 2 additions & 2 deletions src/it/MCOMPILER-525/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>@version.maven-jar-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>@version.maven-antrun-plugin@</version>
<executions>
<execution>
<id>touch</id>
Expand Down
1 change: 0 additions & 1 deletion src/it/mcompiler-120/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@

invoker.goals = clean compile
invoker.buildResult = failure
invoker.java.version = 1.6+
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<version>@version.maven-assembly-plugin@</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
Expand Down
2 changes: 1 addition & 1 deletion src/it/multirelease-patterns/multimodule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>add-java9-supplement</id>
Expand Down
12 changes: 11 additions & 1 deletion src/it/multirelease-patterns/multiproject/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,20 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>@version.maven-dependency-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@version.maven-jar-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>@version.maven-surefire@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 2 additions & 2 deletions src/it/multirelease-patterns/packaging-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
<configuration>
<!-- this shows that the Java 9 code isn't tested -->
<testFailureIgnore>true</testFailureIgnore>
Expand All @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.8+
invoker.goals = verify
13 changes: 11 additions & 2 deletions src/it/multirelease-patterns/singleproject-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,20 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@version.maven-jar-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>@version.maven-surefire@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
<configuration>
<!-- this shows that the Java 9 code isn't tested -->
<testFailureIgnore>true</testFailureIgnore>
Expand All @@ -54,7 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.21.0</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@
# under the License.
invoker.goals = verify -Pmulti-jar
invoker.toolchain.jdk.version=1.9
# Due to toolchain support
invoker.maven.version = 3.3.1+
8 changes: 4 additions & 4 deletions src/it/multirelease-patterns/singleproject-toolchains/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<version>3.1.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -200,7 +200,7 @@
<!-- Run the unit tests with the JVM used to run maven -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>@version.maven-surefire@</version>
<configuration>
<jvm>${env.JAVA_HOME}/bin/java</jvm>
<!-- this shows that the Java 9 code isn't tested -->
Expand Down Expand Up @@ -245,7 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@version.maven-jar-plugin@</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion src/it/non-english-warnings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<fork>false</fork>
<showWarnings>true</showWarnings>
Expand Down
2 changes: 1 addition & 1 deletion src/it/setup_annotation-verify-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.3</version>
<version>@version.maven-plugin-tools@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/it/setup_jar_automodule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>@version.maven-jar-plugin@</version>
<configuration>
<archive>
<manifestEntries>
Expand Down

0 comments on commit eebad60

Please sign in to comment.