Skip to content

Commit 39f6f13

Browse files
atsu85atsu85
authored
Merge pull request #48 from atsu85/issue-45-rename-groupId
fix #45 - added maven project groupId prefix "com.github.raphaeljoliv…
2 parents 0b2c811 + c388b90 commit 39f6f13

8 files changed

Lines changed: 28 additions & 40 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ To install the library using Maven add [JitPack](https://jitpack.io/) repository
123123
<dependency>
124124
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
125125
<artifactId>java2typescript-maven-plugin</artifactId>
126-
<version>v0.3.0.rc2</version><!-- see notes bellow to get either snapshot or specific commit or tag or other version -->
126+
<version>v0.3.0.rc3-SNAPSHOT</version><!-- see notes bellow to get either snapshot or specific commit or tag or other version -->
127127
</dependency>
128128
</dependencies>
129129
...

‎java2typescript-jackson/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
-->
1616
<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">
1717
<modelVersion>4.0.0</modelVersion>
18-
18+
<parent>
19+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
20+
<artifactId>java2typescript</artifactId>
21+
<version>v0.3.0.rc3-SNAPSHOT</version>
22+
</parent>
1923
<artifactId>java2typescript-jackson</artifactId>
2024
<name>java2typescript jackson module</name>
2125
<description>
@@ -59,10 +63,4 @@
5963

6064

6165
</dependencies>
62-
63-
<parent>
64-
<groupId>java2typescript</groupId>
65-
<artifactId>java2typescript</artifactId>
66-
<version>0.3-SNAPSHOT</version>
67-
</parent>
6866
</project>

‎java2typescript-jaxrs/pom.xml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<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">
99
<modelVersion>4.0.0</modelVersion>
1010
<parent>
11-
<groupId>java2typescript</groupId>
11+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
1212
<artifactId>java2typescript</artifactId>
13-
<version>0.3-SNAPSHOT</version>
13+
<version>v0.3.0.rc3-SNAPSHOT</version>
1414
</parent>
1515

16-
<groupId>java2typescript</groupId>
1716
<artifactId>java2typescript-jaxrs</artifactId>
1817
<name>java2typescript jaxrs</name>
19-
<version>0.3-SNAPSHOT</version>
20-
18+
2119
<description>A module to generate JSON descriptor and Typescript definition out of a REST Service, out of JAX-RS annotations</description>
2220
<dependencies>
2321
<dependency>
@@ -36,13 +34,12 @@
3634
<version>15.0</version>
3735
</dependency>
3836
<dependency>
39-
<groupId>java2typescript</groupId>
37+
<groupId>${project.groupId}</groupId>
4038
<artifactId>java2typescript-jackson</artifactId>
4139
<version>${project.version}</version>
4240
</dependency>
43-
4441
<dependency>
45-
<groupId>java2typescript</groupId>
42+
<groupId>${project.groupId}</groupId>
4643
<artifactId>sample-web-app-server</artifactId>
4744
<version>${project.version}</version>
4845
<scope>test</scope>

‎java2typescript-maven-plugin/pom.xml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,18 @@
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
<parent>
5-
<groupId>java2typescript</groupId>
5+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
66
<artifactId>java2typescript</artifactId>
7-
<version>0.3-SNAPSHOT</version>
7+
<version>v0.3.0.rc3-SNAPSHOT</version>
88
</parent>
99

10-
<!-- Maven plugins descriptor needs to contain the same group, artifact and version as used by the application pom.xml -->
11-
<groupId>com.github.raphaeljolivet.java2typescript</groupId><!-- different compared to parent, as plugin will be distributed through jitpack.io with this group id -->
1210
<artifactId>java2typescript-maven-plugin</artifactId>
13-
<version>v0.3.0.rc2</version><!-- different compared to parent, as plugin will be distributed through jitpack.io with this version -->
14-
1511
<packaging>maven-plugin</packaging>
1612
<name>java2typescript maven plugin</name>
1713
<url>http://maven.apache.org</url>
1814

1915
<properties>
2016
<maven.version>2.2.1</maven.version>
21-
<java2typescript.version>0.3-SNAPSHOT</java2typescript.version>
2217
</properties>
2318

2419
<build>
@@ -38,8 +33,8 @@
3833
</plugins>
3934
<pluginManagement>
4035
<plugins>
41-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build
42-
itself. -->
36+
<!--This plugin's configuration is used to store Eclipse m2e settings only.
37+
It has no influence on the Maven build itself. -->
4338
<plugin>
4439
<groupId>org.eclipse.m2e</groupId>
4540
<artifactId>lifecycle-mapping</artifactId>
@@ -115,9 +110,9 @@
115110
<version>1.3.8</version>
116111
</dependency>
117112
<dependency>
118-
<groupId>java2typescript</groupId>
113+
<groupId>${project.groupId}</groupId>
119114
<artifactId>java2typescript-jaxrs</artifactId>
120-
<version>${java2typescript.version}</version>
115+
<version>${project.version}</version>
121116
</dependency>
122117
</dependencies>
123118

‎pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33

4-
<groupId>java2typescript</groupId>
4+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
55
<artifactId>java2typescript</artifactId>
6-
<version>0.3-SNAPSHOT</version>
6+
<version>v0.3.0.rc3-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>java2typescript</name>
99

1010
<properties>
11-
<java2typescript.version>0.3-SNAPSHOT</java2typescript.version>
1211
<maven.compiler.source>1.6</maven.compiler.source>
1312
<maven.compiler.target>1.6</maven.compiler.target>
1413
<github.global.server>github</github.global.server>

‎sample-web-app-client/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>java2typescript</groupId>
6+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
77
<artifactId>java2typescript</artifactId>
8-
<version>0.3-SNAPSHOT</version>
8+
<version>v0.3.0.rc3-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>sample-web-app-client</artifactId>
@@ -21,9 +21,9 @@
2121
<build>
2222
<plugins>
2323
<plugin>
24-
<groupId>java2typescript</groupId>
24+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
2525
<artifactId>java2typescript-maven-plugin</artifactId>
26-
<version>0.3-SNAPSHOT</version>
26+
<version>v0.3.0.rc3-SNAPSHOT</version>
2727
<configuration>
2828
<serviceClass>com.example.rs.PeopleRestService</serviceClass>
2929
<moduleName>People</moduleName>

‎sample-web-app-server/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<modelVersion>4.0.0</modelVersion>
33

44
<parent>
5-
<groupId>java2typescript</groupId>
5+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
66
<artifactId>java2typescript</artifactId>
7-
<version>0.3-SNAPSHOT</version>
7+
<version>v0.3.0.rc3-SNAPSHOT</version>
88
</parent>
99

10-
<groupId>java2typescript</groupId>
1110
<artifactId>sample-web-app-server</artifactId>
1211
<packaging>jar</packaging>
1312

‎sample-web-app/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<modelVersion>4.0.0</modelVersion>
33

44
<parent>
5-
<groupId>java2typescript</groupId>
5+
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
66
<artifactId>java2typescript</artifactId>
7-
<version>0.3-SNAPSHOT</version>
7+
<version>v0.3.0.rc3-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>sample-web-app</artifactId>
@@ -99,7 +99,7 @@
9999
<plugin>
100100
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
101101
<artifactId>java2typescript-maven-plugin</artifactId>
102-
<version>v0.3.0.rc2</version>
102+
<version>v0.3.0.rc3-SNAPSHOT</version>
103103
<configuration>
104104
<serviceClass>com.example.rs.PeopleRestService</serviceClass>
105105
<moduleName>People</moduleName>

0 commit comments

Comments
 (0)