Skip to content

Commit dd71532

Browse files
committed
Fixed #515 - Maven 4.0.X
- Upgraded several dependencies. - Removed combine.self="append" and replaced it with "merge"
1 parent dc47961 commit dd71532

File tree

32 files changed

+63
-61
lines changed

32 files changed

+63
-61
lines changed

itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
:issue-509: https://github.com/khmarbaise/maven-it-extension/issues/509[Fixed #509]
5656
:issue-511: https://github.com/khmarbaise/maven-it-extension/issues/511[Fixed #511]
5757
:issue-513: https://github.com/khmarbaise/maven-it-extension/issues/513[Fixed #513]
58+
:issue-515: https://github.com/khmarbaise/maven-it-extension/issues/515[Fixed #515]
5859
:pr-460: https://github.com/khmarbaise/maven-it-extension/pull/460[Pull request #460]
5960
:pr-462: https://github.com/khmarbaise/maven-it-extension/pull/462[Pull request #462]
6061

@@ -115,6 +116,7 @@
115116
* {issue-483} - Replace composite with linux variant.
116117
* {issue-488} - Upgrade to Maven 4.0.0 Beta 4 + Maven 3.9.9
117118
* {issue-509} - Upgrade asciidoctor-maven-plugin 3.2.0
119+
* {issue-515} - Maven 4.0.X
118120

119121
*Documentation Improvements*
120122

itf-examples/src/test/resources-its/com/soebes/itf/examples/MvnDirectoryIT/hidden_files_only/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/MvnDirectoryIT/non_hidden_files/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/defaults/DefaultsForAllIT/option_debug/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/goals/GoalsIT/goal_clean/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/goals/GoalsIT/goal_clean_compile/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/goals/GoalsIT/no_goals_at_all/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/goals/GoalsOnClassIT/goal_clean/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/goals/MetaAnnotationGoalIT/clean_verify/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>
@@ -100,7 +100,7 @@
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102102
<configuration>
103-
<compilerArgs combine.self="append">
103+
<compilerArgs combine.self="merge">
104104
<arg>-Xlint:-options</arg>
105105
</compilerArgs>
106106
</configuration>

itf-examples/src/test/resources-its/com/soebes/itf/examples/mps/xyz/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>nl.jqno.equalsverifier</groupId>
5555
<artifactId>equalsverifier</artifactId>
56-
<version>3.15.5</version>
56+
<version>4.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.assertj</groupId>

0 commit comments

Comments
 (0)