Skip to content

Commit 833a2e4

Browse files
arjantijmsarjantijms
authored
Merge pull request #46 from arjantijms/tidying_poms
Tidying poms
2 parents 1135e99 + aea6b41 commit 833a2e4

File tree

138 files changed

+485
-663
lines changed

Some content is hidden

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

138 files changed

+485
-663
lines changed

‎tutorial/archetypes/jaxrs-service-archetype/pom.xml

+10-11
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
16+
1817
<parent>
1918
<groupId>jakarta.tutorial</groupId>
2019
<artifactId>archetypes</artifactId>
@@ -23,21 +22,14 @@
2322

2423
<artifactId>jaxrs-service-archetype</artifactId>
2524
<packaging>maven-archetype</packaging>
25+
2626
<name>jaxrs-service-archetype</name>
2727

2828
<properties>
2929
<maven.archetype.plugin.version>3.2.0</maven.archetype.plugin.version>
3030
</properties>
3131

3232
<build>
33-
<extensions>
34-
<extension>
35-
<groupId>org.apache.maven.archetype</groupId>
36-
<artifactId>archetype-packaging</artifactId>
37-
<version>${maven.archetype.plugin.version}</version>
38-
</extension>
39-
</extensions>
40-
4133
<pluginManagement>
4234
<plugins>
4335
<plugin>
@@ -46,5 +38,12 @@
4638
</plugin>
4739
</plugins>
4840
</pluginManagement>
41+
<extensions>
42+
<extension>
43+
<groupId>org.apache.maven.archetype</groupId>
44+
<artifactId>archetype-packaging</artifactId>
45+
<version>${maven.archetype.plugin.version}</version>
46+
</extension>
47+
</extensions>
4948
</build>
5049
</project>

‎tutorial/archetypes/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
16+
1817
<parent>
1918
<groupId>jakarta.tutorial</groupId>
2019
<artifactId>examples</artifactId>
@@ -23,6 +22,7 @@
2322

2423
<artifactId>archetypes</artifactId>
2524
<packaging>pom</packaging>
25+
2626
<name>archetypes</name>
2727

2828
<modules>

‎tutorial/batch/phonebilling/pom.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
@@ -26,5 +24,4 @@
2624
<packaging>war</packaging>
2725

2826
<name>phonebilling</name>
29-
3027
</project>

‎tutorial/batch/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
@@ -10,16 +11,15 @@
1011
1112
-->
1213

13-
<project xmlns="http://maven.apache.org/POM/4.0.0"
14-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1615
<modelVersion>4.0.0</modelVersion>
1716

1817
<parent>
1918
<groupId>jakarta.tutorial</groupId>
2019
<artifactId>examples</artifactId>
2120
<version>9.0-SNAPSHOT</version>
2221
</parent>
22+
2323
<groupId>jakarta.tutorial.batch</groupId>
2424
<artifactId>parent</artifactId>
2525
<packaging>pom</packaging>

‎tutorial/batch/webserverlog/pom.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
@@ -26,5 +24,4 @@
2624
<packaging>war</packaging>
2725

2826
<name>webserverlog</name>
29-
3027
</project>

‎tutorial/case-studies/dukes-bookstore/pom.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>

‎tutorial/case-studies/dukes-forest/dukes-payment/pom.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

19-
2017
<parent>
2118
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2219
<artifactId>parent</artifactId>
2320
<version>9.0-SNAPSHOT</version>
2421
</parent>
22+
2523
<artifactId>dukes-payment</artifactId>
2624
<packaging>war</packaging>
2725

@@ -32,5 +30,4 @@
3230
<version>${project.version}</version>
3331
</dependency>
3432
</dependencies>
35-
3633
</project>

‎tutorial/case-studies/dukes-forest/dukes-resources/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<artifactId>dukes-resources</artifactId>
2524
<packaging>jar</packaging>
2625

2726
<name>dukes-resources</name>
28-
2927
</project>

‎tutorial/case-studies/dukes-forest/dukes-shipment/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<artifactId>dukes-shipment</artifactId>
2524
<packaging>war</packaging>
2625

‎tutorial/case-studies/dukes-forest/dukes-store/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<artifactId>dukes-store</artifactId>
2524
<packaging>war</packaging>
2625

@@ -73,5 +72,4 @@
7372
</plugin>
7473
</plugins>
7574
</build>
76-
7775
</project>

‎tutorial/case-studies/dukes-forest/entities/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<artifactId>entities</artifactId>
2524
<packaging>jar</packaging>
2625

‎tutorial/case-studies/dukes-forest/events/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<artifactId>events</artifactId>
2524
<packaging>jar</packaging>
2625

2726
<name>events</name>
28-
2927
</project>

‎tutorial/case-studies/dukes-forest/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial.case-studies</groupId>
2119
<artifactId>parent</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<groupId>jakarta.tutorial.case-studies.dukes-forest</groupId>
2524
<artifactId>parent</artifactId>
2625
<packaging>pom</packaging>
@@ -47,5 +46,4 @@
4746
</plugin>
4847
</plugins>
4948
</build>
50-
5149
</project>

‎tutorial/case-studies/dukes-tutoring/dukes-tutoring-common/pom.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
16+
1817
<parent>
1918
<groupId>jakarta.tutorial.case-studies.dukes-tutoring</groupId>
2019
<artifactId>parent</artifactId>
2120
<version>9.0-SNAPSHOT</version>
2221
</parent>
22+
2323
<artifactId>dukes-tutoring-common</artifactId>
24+
2425
<name>dukes-tutoring-common</name>
26+
2527
<build>
2628
<plugins>
2729
<plugin>

‎tutorial/case-studies/dukes-tutoring/dukes-tutoring-war/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
16+
1817
<parent>
1918
<groupId>jakarta.tutorial.case-studies.dukes-tutoring</groupId>
2019
<artifactId>parent</artifactId>
2120
<version>9.0-SNAPSHOT</version>
2221
</parent>
22+
2323
<artifactId>dukes-tutoring-war</artifactId>
2424
<packaging>war</packaging>
2525

2626
<name>dukes-tutoring-war</name>
27+
2728
<dependencies>
2829
<dependency>
2930
<groupId>${project.groupId}</groupId>

‎tutorial/case-studies/dukes-tutoring/pom.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,21 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
16+
1817
<parent>
1918
<groupId>jakarta.tutorial.case-studies</groupId>
2019
<artifactId>parent</artifactId>
2120
<version>9.0-SNAPSHOT</version>
2221
</parent>
22+
2323
<groupId>jakarta.tutorial.case-studies.dukes-tutoring</groupId>
2424
<artifactId>parent</artifactId>
2525
<packaging>pom</packaging>
26+
2627
<name>dukes-tutoring</name>
28+
2729
<modules>
2830
<module>dukes-tutoring-war</module>
2931
<module>dukes-tutoring-common</module>

‎tutorial/case-studies/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<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">
1715
<modelVersion>4.0.0</modelVersion>
1816

1917
<parent>
2018
<groupId>jakarta.tutorial</groupId>
2119
<artifactId>examples</artifactId>
2220
<version>9.0-SNAPSHOT</version>
2321
</parent>
22+
2423
<groupId>jakarta.tutorial.case-studies</groupId>
2524
<artifactId>parent</artifactId>
2625
<packaging>pom</packaging>
@@ -32,5 +31,4 @@
3231
<module>dukes-forest</module>
3332
<module>dukes-tutoring</module>
3433
</modules>
35-
3634
</project>

0 commit comments

Comments
 (0)