Skip to content

jProtoc v0.9.0 #102

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

Merged
merged 1 commit into from
Feb 20, 2019
Merged

jProtoc v0.9.0 #102

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
2 changes: 1 addition & 1 deletion demos/grpc-java-contrib-demo/time-client-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<id>java8</id>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>jprotoc</artifactId>
<version>${project.version}</version>
<version>${jprotoc.version}</version>
<mainClass>com.salesforce.jprotoc.jdk8.Jdk8Generator</mainClass>
</protocPlugin>
</protocPlugins>
Expand Down
82 changes: 6 additions & 76 deletions demos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
<mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>

<!-- Dependency Versions -->
<contrib.version>0.8.1</contrib.version>
<jprotoc.version>0.8.1</jprotoc.version>

<grpc.version>1.12.0</grpc.version>
<protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
<slf4j.version>1.7.21</slf4j.version>
Expand Down Expand Up @@ -94,18 +97,14 @@
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>grpc-contrib</artifactId>
<version>${project.version}</version>
<version>${contrib.version}</version>
</dependency>
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>grpc-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>jprotoc</artifactId>
<version>${project.version}</version>
<version>${contrib.version}</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
Expand All @@ -116,36 +115,16 @@
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
<version>${mustache-java.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Provided dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -159,55 +138,6 @@
<version>${gson.version}</version>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing-proto</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion jprotoc/jprotoc-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>jprotoc-parent</artifactId>
<groupId>com.salesforce.servicelibs</groupId>
<version>0.8.2-SNAPSHOT</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion jprotoc/jprotoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>jprotoc-parent</artifactId>
<groupId>com.salesforce.servicelibs</groupId>
<version>0.8.2-SNAPSHOT</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
50 changes: 4 additions & 46 deletions jprotoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>jprotoc-parent</artifactId>
<packaging>pom</packaging>
<version>0.8.2-SNAPSHOT</version>
<version>0.9.0</version>

<url>https://github.com/salesforce/grpc-java-contrib</url>

Expand Down Expand Up @@ -56,6 +56,8 @@
<mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>

<!-- Dependency Versions -->
<contrib.version>0.8.1</contrib.version>

<grpc.version>1.12.0</grpc.version>
<protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
<slf4j.version>1.7.21</slf4j.version>
Expand Down Expand Up @@ -94,12 +96,7 @@
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>grpc-contrib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>grpc-spring</artifactId>
<version>${project.version}</version>
<version>${contrib.version}</version>
</dependency>
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
Expand All @@ -121,11 +118,6 @@
<artifactId>grpc-core</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
Expand All @@ -136,16 +128,6 @@
<artifactId>compiler</artifactId>
<version>${mustache-java.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Provided dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -160,18 +142,6 @@
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing-proto</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -196,18 +166,6 @@
<version>${commons-lang.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down