Skip to content

Commit 21a59d9

Browse files
rbygraverbygrave
committed
Pom change to use parent and modules with project.version
1 parent 1a6d3f5 commit 21a59d9

File tree

5 files changed

+33
-46
lines changed

5 files changed

+33
-46
lines changed

‎controller/pom.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.dinject</groupId>
65
<artifactId>dinject-controller</artifactId>
7-
<version>1.20-SNAPSHOT</version>
86

97
<parent>
10-
<groupId>org.avaje</groupId>
11-
<artifactId>java8-oss</artifactId>
12-
<version>2.1</version>
8+
<groupId>io.dinject</groupId>
9+
<artifactId>controller-parent</artifactId>
10+
<version>1.20-SNAPSHOT</version>
11+
<relativePath>..</relativePath>
1312
</parent>
1413

15-
<scm>
16-
<developerConnection>scm:git:[email protected]:dinject/javalin-generator.git</developerConnection>
17-
<tag>HEAD</tag>
18-
</scm>
19-
2014
<dependencies>
2115

2216
<dependency>

‎generator-core/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.dinject</groupId>
65
<artifactId>webgen-core</artifactId>
7-
<version>1.20-SNAPSHOT</version>
86

97
<parent>
10-
<groupId>org.avaje</groupId>
11-
<artifactId>java8-oss</artifactId>
12-
<version>2.1</version>
8+
<groupId>io.dinject</groupId>
9+
<artifactId>controller-parent</artifactId>
10+
<version>1.20-SNAPSHOT</version>
11+
<relativePath>..</relativePath>
1312
</parent>
1413

15-
<scm>
16-
<developerConnection>scm:git:[email protected]:dinject/javalin-generator.git</developerConnection>
17-
<tag>HEAD</tag>
18-
</scm>
19-
2014
<properties>
2115
<swagger.version>2.0.8</swagger.version>
2216
<jackson-databind.version>2.10.1</jackson-databind.version>
@@ -39,7 +33,7 @@
3933
<dependency>
4034
<groupId>io.dinject</groupId>
4135
<artifactId>dinject-controller</artifactId>
42-
<version>1.20-SNAPSHOT</version>
36+
<version>${project.version}</version>
4337
</dependency>
4438

4539
<dependency>

‎generator-helidon/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.dinject</groupId>
65
<artifactId>helidon-generator</artifactId>
7-
<version>1.20-SNAPSHOT</version>
86

97
<parent>
10-
<groupId>org.avaje</groupId>
11-
<artifactId>java8-oss</artifactId>
12-
<version>2.1</version>
8+
<groupId>io.dinject</groupId>
9+
<artifactId>controller-parent</artifactId>
10+
<version>1.20-SNAPSHOT</version>
11+
<relativePath>..</relativePath>
1312
</parent>
1413

15-
<scm>
16-
<developerConnection>scm:git:[email protected]:dinject/javalin-generator.git</developerConnection>
17-
<tag>HEAD</tag>
18-
</scm>
19-
2014
<properties>
2115
<swagger.version>2.0.8</swagger.version>
2216
<jackson-databind.version>2.10.1</jackson-databind.version>
@@ -27,7 +21,7 @@
2721
<dependency>
2822
<groupId>io.dinject</groupId>
2923
<artifactId>webgen-core</artifactId>
30-
<version>1.19</version>
24+
<version>${project.version}</version>
3125
</dependency>
3226

3327
<!-- test dependencies -->

‎generator-javalin/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.dinject</groupId>
65
<artifactId>javalin-generator</artifactId>
7-
<version>1.20-SNAPSHOT</version>
86

97
<parent>
10-
<groupId>org.avaje</groupId>
11-
<artifactId>java8-oss</artifactId>
12-
<version>2.1</version>
8+
<groupId>io.dinject</groupId>
9+
<artifactId>controller-parent</artifactId>
10+
<version>1.20-SNAPSHOT</version>
11+
<relativePath>..</relativePath>
1312
</parent>
1413

15-
<scm>
16-
<developerConnection>scm:git:[email protected]:dinject/javalin-generator.git</developerConnection>
17-
<tag>HEAD</tag>
18-
</scm>
19-
2014
<properties>
2115
<swagger.version>2.0.8</swagger.version>
2216
<jackson-databind.version>2.10.1</jackson-databind.version>
@@ -27,7 +21,7 @@
2721
<dependency>
2822
<groupId>io.dinject</groupId>
2923
<artifactId>webgen-core</artifactId>
30-
<version>1.19</version>
24+
<version>${project.version}</version>
3125
</dependency>
3226

3327
<!-- test dependencies -->

‎pom.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,27 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>io.dinject</groupId>
8-
<artifactId>main-reactor</artifactId>
9-
<version>1.0</version>
8+
<artifactId>controller-parent</artifactId>
9+
<version>1.20-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

12+
<parent>
13+
<groupId>org.avaje</groupId>
14+
<artifactId>java8-oss</artifactId>
15+
<version>2.1</version>
16+
</parent>
17+
18+
<scm>
19+
<developerConnection>scm:git:[email protected]:dinject/javalin-generator.git</developerConnection>
20+
<tag>HEAD</tag>
21+
</scm>
22+
1223
<modules>
1324
<module>controller</module>
1425
<module>generator-core</module>
1526
<module>generator-javalin</module>
1627
<module>generator-helidon</module>
17-
<module>tests</module>
28+
<!-- <module>tests</module>-->
1829
</modules>
1930

2031
</project>

0 commit comments

Comments
 (0)