Skip to content

Commit

Permalink
WIP: Fixed #399 - Upgrade all plugins used in IT to most recent versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@khmarbaise
khmarbaise committed Dec 19, 2023
1 parent 87092e7 commit 88db018
Show file tree
Hide file tree
Showing 35 changed files with 98 additions and 534 deletions.
2 changes: 1 addition & 1 deletion itf-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
junit.jupiter.execution.parallel.mode.default=concurrent
junit.jupiter.execution.parallel.mode.classes.default=same_thread
junit.jupiter.execution.parallel.config.strategy=fixed
junit.jupiter.execution.parallel.config.fixed.parallelism=6
junit.jupiter.execution.parallel.config.fixed.parallelism=12
</configurationParameters>
</properties>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/EARIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void transitive_excludes(MavenExecutionResult result) {
.project()
.hasTarget()
.withEarFile()
.containsOnlyOnce("org.apache.maven-maven-core-3.0.jar", "META-INF/application.xml");
.containsOnlyOnce("org.apache.maven-maven-core-3.2.5.jar", "META-INF/application.xml");

// assertThat(log).info().stream().filter(s -> s.startsWith("TESTING"));
// assertThat(log).debug().stream().filter(s -> s.endsWith("FAILURE"));
Expand Down
18 changes: 9 additions & 9 deletions ...examples/src/test/java/com/soebes/itf/examples/properties/MetaAnnotationPropertiesIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ void property_skiptests(MavenExecutionResult result) {
.out()
.info()
.containsSubsequence(
"--- maven-enforcer-plugin:3.0.0:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.7:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.0.0-M5:test (default-test) @ kata-fraction ---",
"--- maven-enforcer-plugin:3.4.1:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.11:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.2.2:test (default-test) @ kata-fraction ---",
"Tests are skipped.",
"--- maven-jar-plugin:3.2.2:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.10.0:attach-descriptor (attach-descriptor) @ kata-fraction ---"
"--- maven-jar-plugin:3.3.0:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.12.1:attach-descriptor (attach-descriptor) @ kata-fraction ---"
);

assertThat(result)
Expand Down
18 changes: 9 additions & 9 deletions itf-examples/src/test/java/com/soebes/itf/examples/properties/PropertiesIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ void property_skiptests(MavenExecutionResult result) {
.out()
.info()
.containsSubsequence(
"--- maven-enforcer-plugin:3.0.0:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.7:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.0.0-M5:test (default-test) @ kata-fraction ---",
"--- maven-enforcer-plugin:3.4.1:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.11:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.2.2:test (default-test) @ kata-fraction ---",
"Tests are skipped.",
"--- maven-jar-plugin:3.2.2:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.10.0:attach-descriptor (attach-descriptor) @ kata-fraction ---"
"--- maven-jar-plugin:3.3.0:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.12.1:attach-descriptor (attach-descriptor) @ kata-fraction ---"
);
assertThat(result)
.isSuccessful()
Expand Down
18 changes: 9 additions & 9 deletions itf-examples/src/test/java/com/soebes/itf/examples/properties/PropertiesOnClassIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ void property_skiptests(MavenExecutionResult result) {
.out()
.info()
.containsSubsequence(
"--- maven-enforcer-plugin:3.0.0:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.7:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.0.0-M5:test (default-test) @ kata-fraction ---",
"--- maven-enforcer-plugin:3.4.1:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.11:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.2.2:test (default-test) @ kata-fraction ---",
"Tests are skipped.",
"--- maven-jar-plugin:3.2.2:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.10.0:attach-descriptor (attach-descriptor) @ kata-fraction ---"
"--- maven-jar-plugin:3.3.0:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.12.1:attach-descriptor (attach-descriptor) @ kata-fraction ---"
);
assertThat(result)
.isSuccessful()
Expand Down
18 changes: 9 additions & 9 deletions itf-examples/src/test/java/com/soebes/itf/examples/properties/PropertiesOnNestedClassIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ void property_skiptests(MavenExecutionResult result) {
.out()
.info()
.containsSubsequence(
"--- maven-enforcer-plugin:3.0.0:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.7:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.2.0:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.9.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.0.0-M5:test (default-test) @ kata-fraction ---",
"--- maven-enforcer-plugin:3.4.1:enforce (enforce-maven) @ kata-fraction ---",
"--- jacoco-maven-plugin:0.8.11:prepare-agent (default) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:resources (default-resources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:compile (default-compile) @ kata-fraction ---",
"--- maven-resources-plugin:3.3.1:testResources (default-testResources) @ kata-fraction ---",
"--- maven-compiler-plugin:3.11.0:testCompile (default-testCompile) @ kata-fraction ---",
"--- maven-surefire-plugin:3.2.2:test (default-test) @ kata-fraction ---",
"Tests are skipped.",
"--- maven-jar-plugin:3.2.2:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.10.0:attach-descriptor (attach-descriptor) @ kata-fraction ---"
"--- maven-jar-plugin:3.3.0:jar (default-jar) @ kata-fraction ---",
"--- maven-site-plugin:3.12.1:attach-descriptor (attach-descriptor) @ kata-fraction ---"
);
assertThat(result)
.isSuccessful()
Expand Down
2 changes: 1 addition & 1 deletion itf-examples/src/test/resources-its/com/soebes/itf/examples/EARIT/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<configuration>
<generateApplicationXml>true</generateApplicationXml>
</configuration>
Expand Down
49 changes: 0 additions & 49 deletions itf-examples/src/test/resources-its/com/soebes/itf/examples/EARIT/basic/verify.bsh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion itf-examples/src/test/resources-its/com/soebes/itf/examples/EARIT/packaging_excludes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<configuration>
<packagingExcludes>commons-lang-*.jar</packagingExcludes>
</configuration>
Expand Down
61 changes: 0 additions & 61 deletions ...amples/src/test/resources-its/com/soebes/itf/examples/EARIT/packaging_excludes/verify.bsh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion itf-examples/src/test/resources-its/com/soebes/itf/examples/EARIT/packaging_includes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<configuration>
<packagingIncludes>commons-lang-*.jar,META-INF/**</packagingIncludes>
</configuration>
Expand Down
62 changes: 0 additions & 62 deletions ...amples/src/test/resources-its/com/soebes/itf/examples/EARIT/packaging_includes/verify.bsh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...es/src/test/resources-its/com/soebes/itf/examples/EARIT/resource_custom_directory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<configuration>
<filtering>true</filtering>
</configuration>
Expand Down
49 changes: 0 additions & 49 deletions ...src/test/resources-its/com/soebes/itf/examples/EARIT/resource_custom_directory/verify.bsh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...c/test/resources-its/com/soebes/itf/examples/EARIT/skinny_wars_javaee5/ear-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<configuration>
<version>5</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
Expand Down
Loading

0 comments on commit 88db018

Please sign in to comment.