Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 11+ compatibility #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Java 11+ compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion code-generation/plugin-proto-compiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
<parent>
<artifactId>code-generation</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>plugin-proto-compiler</artifactId>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion code-generation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>protostuff-examples</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>code-generation</artifactId>
Expand Down
7 changes: 6 additions & 1 deletion hello-world/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
<parent>
<artifactId>protostuff-examples</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>hello-world</artifactId>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
Expand Down
9 changes: 7 additions & 2 deletions multimodule-imports/a/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@
<parent>
<artifactId>multimodule-imports</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>a</artifactId>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
<version>1.3.6</version>
<version>${protostuff.version}</version>
</dependency>
</dependencies>

Expand Down
9 changes: 7 additions & 2 deletions multimodule-imports/b/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>multimodule-imports</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,6 +14,11 @@
<dependencies>
<!-- Add dependency to "a" - it contains imported proto file and generated classes. -->
<!-- Each maven module compile only its own proto-s. -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
<dependency>
<groupId>io.protostuff.examples</groupId>
<artifactId>a</artifactId>
Expand All @@ -22,7 +27,7 @@
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
<version>1.3.6</version>
<version>${protostuff.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion multimodule-imports/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>protostuff-examples</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
20 changes: 12 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@

<groupId>io.protostuff.examples</groupId>
<artifactId>protostuff-examples</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protostuff.version>1.3.7</protostuff.version>
<guava.version>18.0</guava.version>
<junit.version>4.12</junit.version>
<protostuff.version>1.7.4</protostuff.version>
<guava.version>32.1.2-jre</guava.version>
<junit.version>4.13.2</junit.version>
<annotation-api.version>1.3.2</annotation-api.version>
</properties>

<modules>
Expand All @@ -27,15 +28,18 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<!-- Java 17 : source and target 8 or greater -->
<!-- Java 8-11 : source and target 6 or greater -->
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
</project>
3 changes: 1 addition & 2 deletions runtime-schema-usage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<parent>
<artifactId>protostuff-examples</artifactId>
<groupId>io.protostuff.examples</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>runtime-schema-usage</artifactId>


<dependencies>
<dependency>
<groupId>io.protostuff</groupId>
Expand Down