Skip to content

Commit 42a88c9

Browse files
sruehlsruehl
committed
chore(build): maven 4 migration
https://maven.apache.org/guides/mini/guide-migration-to-mvn4.html
1 parent b191497 commit 42a88c9

File tree

106 files changed

+449
-745
lines changed

Some content is hidden

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

106 files changed

+449
-745
lines changed

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.4
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip

‎code-generation/language-base-freemarker/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language-base-freemarker</artifactId>

‎code-generation/language/c/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation-language</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language-c</artifactId>

‎code-generation/language/c/src/test/resources/integration-test/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
<modelVersion>4.0.0</modelVersion>
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>

‎code-generation/language/cs/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation-language</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language-cs</artifactId>

‎code-generation/language/go/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation-language</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language-go</artifactId>

‎code-generation/language/go/src/test/resources/plc4go/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
21+
<modelVersion>4.1.0</modelVersion>
2222

2323
<parent>
2424
<groupId>org.apache.plc4x</groupId>

‎code-generation/language/java/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation-language</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language-java</artifactId>

‎code-generation/language/java/src/test/resources/integration-test/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
<modelVersion>4.0.0</modelVersion>
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>

‎code-generation/language/pom.xml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
2121

22-
<modelVersion>4.0.0</modelVersion>
22+
<modelVersion>4.1.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.apache.plc4x</groupId>
2626
<artifactId>plc4x-code-generation</artifactId>
27-
<version>0.14.0-SNAPSHOT</version>
2827
</parent>
2928

3029
<artifactId>plc4x-code-generation-language</artifactId>
@@ -40,37 +39,37 @@
4039
<profiles>
4140
<profile>
4241
<id>with-c</id>
43-
<modules>
44-
<module>c</module>
45-
</modules>
42+
<subprojects>
43+
<subproject>c</subproject>
44+
</subprojects>
4645
</profile>
4746

4847
<profile>
4948
<id>with-dotnet</id>
50-
<modules>
51-
<module>cs</module>
52-
</modules>
49+
<subprojects>
50+
<subproject>cs</subproject>
51+
</subprojects>
5352
</profile>
5453

5554
<profile>
5655
<id>with-go</id>
57-
<modules>
58-
<module>go</module>
59-
</modules>
56+
<subprojects>
57+
<subproject>go</subproject>
58+
</subprojects>
6059
</profile>
6160

6261
<profile>
6362
<id>with-java</id>
64-
<modules>
65-
<module>java</module>
66-
</modules>
63+
<subprojects>
64+
<subproject>java</subproject>
65+
</subprojects>
6766
</profile>
6867

6968
<profile>
7069
<id>with-python</id>
71-
<modules>
72-
<module>python</module>
73-
</modules>
70+
<subprojects>
71+
<subproject>python</subproject>
72+
</subprojects>
7473
</profile>
7574
</profiles>
7675

0 commit comments

Comments
 (0)