Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ To install the library using Maven add [JitPack](https://jitpack.io/) repository
<dependency>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript-maven-plugin</artifactId>
<version>v0.3.0.rc2</version><!-- see notes bellow to get either snapshot or specific commit or tag or other version -->
<version>v0.3.0.rc3-SNAPSHOT</version><!-- see notes bellow to get either snapshot or specific commit or tag or other version -->
</dependency>
</dependencies>
...
Expand Down
12 changes: 5 additions & 7 deletions java2typescript-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>
<artifactId>java2typescript-jackson</artifactId>
<name>java2typescript jackson module</name>
<description>
Expand Down Expand Up @@ -59,10 +63,4 @@


</dependencies>

<parent>
<groupId>java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
</parent>
</project>
13 changes: 5 additions & 8 deletions java2typescript-jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>

<groupId>java2typescript</groupId>
<artifactId>java2typescript-jaxrs</artifactId>
<name>java2typescript jaxrs</name>
<version>0.3-SNAPSHOT</version>


<description>A module to generate JSON descriptor and Typescript definition out of a REST Service, out of JAX-RS annotations</description>
<dependencies>
<dependency>
Expand All @@ -36,13 +34,12 @@
<version>15.0</version>
</dependency>
<dependency>
<groupId>java2typescript</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>java2typescript-jackson</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>java2typescript</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>sample-web-app-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Expand Down
17 changes: 6 additions & 11 deletions java2typescript-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,18 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>

<!-- Maven plugins descriptor needs to contain the same group, artifact and version as used by the application pom.xml -->
<groupId>com.github.raphaeljolivet.java2typescript</groupId><!-- different compared to parent, as plugin will be distributed through jitpack.io with this group id -->
<artifactId>java2typescript-maven-plugin</artifactId>
<version>v0.3.0.rc2</version><!-- different compared to parent, as plugin will be distributed through jitpack.io with this version -->

<packaging>maven-plugin</packaging>
<name>java2typescript maven plugin</name>
<url>http://maven.apache.org</url>

<properties>
<maven.version>2.2.1</maven.version>
<java2typescript.version>0.3-SNAPSHOT</java2typescript.version>
</properties>

<build>
Expand All @@ -38,8 +33,8 @@
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build
itself. -->
<!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand Down Expand Up @@ -115,9 +110,9 @@
<version>1.3.8</version>
</dependency>
<dependency>
<groupId>java2typescript</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>java2typescript-jaxrs</artifactId>
<version>${java2typescript.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<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">
<modelVersion>4.0.0</modelVersion>

<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>java2typescript</name>

<properties>
<java2typescript.version>0.3-SNAPSHOT</java2typescript.version>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<github.global.server>github</github.global.server>
Expand Down
8 changes: 4 additions & 4 deletions sample-web-app-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>

<artifactId>sample-web-app-client</artifactId>
Expand All @@ -21,9 +21,9 @@
<build>
<plugins>
<plugin>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript-maven-plugin</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
<configuration>
<serviceClass>com.example.rs.PeopleRestService</serviceClass>
<moduleName>People</moduleName>
Expand Down
5 changes: 2 additions & 3 deletions sample-web-app-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>

<groupId>java2typescript</groupId>
<artifactId>sample-web-app-server</artifactId>
<packaging>jar</packaging>

Expand Down
6 changes: 3 additions & 3 deletions sample-web-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>java2typescript</groupId>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript</artifactId>
<version>0.3-SNAPSHOT</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
</parent>

<artifactId>sample-web-app</artifactId>
Expand Down Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>com.github.raphaeljolivet.java2typescript</groupId>
<artifactId>java2typescript-maven-plugin</artifactId>
<version>v0.3.0.rc2</version>
<version>v0.3.0.rc3-SNAPSHOT</version>
<configuration>
<serviceClass>com.example.rs.PeopleRestService</serviceClass>
<moduleName>People</moduleName>
Expand Down