Skip to content

Commit c5cd723

Browse files
rmichelarmichela
authored
Merge pull request #102 from salesforce/release/jprotoc-0.9.0
jProtoc v0.9.0
2 parents 62093dc + e37982f commit c5cd723

File tree

5 files changed

+13
-125
lines changed

5 files changed

+13
-125
lines changed

‎demos/grpc-java-contrib-demo/time-client-demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<id>java8</id>
6262
<groupId>com.salesforce.servicelibs</groupId>
6363
<artifactId>jprotoc</artifactId>
64-
<version>${project.version}</version>
64+
<version>${jprotoc.version}</version>
6565
<mainClass>com.salesforce.jprotoc.jdk8.Jdk8Generator</mainClass>
6666
</protocPlugin>
6767
</protocPlugins>

‎demos/pom.xml‎

Lines changed: 6 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
5757

5858
<!-- Dependency Versions -->
59+
<contrib.version>0.8.1</contrib.version>
60+
<jprotoc.version>0.8.1</jprotoc.version>
61+
5962
<grpc.version>1.12.0</grpc.version>
6063
<protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
6164
<slf4j.version>1.7.21</slf4j.version>
@@ -94,18 +97,14 @@
9497
<dependency>
9598
<groupId>com.salesforce.servicelibs</groupId>
9699
<artifactId>grpc-contrib</artifactId>
97-
<version>${project.version}</version>
100+
<version>${contrib.version}</version>
98101
</dependency>
99102
<dependency>
100103
<groupId>com.salesforce.servicelibs</groupId>
101104
<artifactId>grpc-spring</artifactId>
102-
<version>${project.version}</version>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.salesforce.servicelibs</groupId>
106-
<artifactId>jprotoc</artifactId>
107-
<version>${project.version}</version>
105+
<version>${contrib.version}</version>
108106
</dependency>
107+
109108
<dependency>
110109
<groupId>io.grpc</groupId>
111110
<artifactId>grpc-netty</artifactId>
@@ -116,36 +115,16 @@
116115
<artifactId>grpc-protobuf</artifactId>
117116
<version>${grpc.version}</version>
118117
</dependency>
119-
<dependency>
120-
<groupId>io.grpc</groupId>
121-
<artifactId>grpc-core</artifactId>
122-
<version>${grpc.version}</version>
123-
</dependency>
124-
<dependency>
125-
<groupId>io.grpc</groupId>
126-
<artifactId>grpc-context</artifactId>
127-
<version>${grpc.version}</version>
128-
</dependency>
129118
<dependency>
130119
<groupId>io.grpc</groupId>
131120
<artifactId>grpc-stub</artifactId>
132121
<version>${grpc.version}</version>
133122
</dependency>
134-
<dependency>
135-
<groupId>com.github.spullara.mustache.java</groupId>
136-
<artifactId>compiler</artifactId>
137-
<version>${mustache-java.version}</version>
138-
</dependency>
139123
<dependency>
140124
<groupId>org.springframework</groupId>
141125
<artifactId>spring-context</artifactId>
142126
<version>${spring.version}</version>
143127
</dependency>
144-
<dependency>
145-
<groupId>org.springframework</groupId>
146-
<artifactId>spring-webmvc</artifactId>
147-
<version>${spring.version}</version>
148-
</dependency>
149128
<!-- Provided dependencies -->
150129
<dependency>
151130
<groupId>org.slf4j</groupId>
@@ -159,55 +138,6 @@
159138
<version>${gson.version}</version>
160139
<scope>provided</scope>
161140
</dependency>
162-
<!-- Test dependencies -->
163-
<dependency>
164-
<groupId>io.grpc</groupId>
165-
<artifactId>grpc-testing</artifactId>
166-
<version>${grpc.version}</version>
167-
<scope>test</scope>
168-
</dependency>
169-
<dependency>
170-
<groupId>io.grpc</groupId>
171-
<artifactId>grpc-testing-proto</artifactId>
172-
<version>${grpc.version}</version>
173-
<scope>test</scope>
174-
</dependency>
175-
<dependency>
176-
<groupId>junit</groupId>
177-
<artifactId>junit</artifactId>
178-
<version>${junit.version}</version>
179-
<scope>test</scope>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.assertj</groupId>
183-
<artifactId>assertj-core</artifactId>
184-
<version>${assertj.version}</version>
185-
<scope>test</scope>
186-
</dependency>
187-
<dependency>
188-
<groupId>org.awaitility</groupId>
189-
<artifactId>awaitility</artifactId>
190-
<version>${awaitility.version}</version>
191-
<scope>test</scope>
192-
</dependency>
193-
<dependency>
194-
<groupId>commons-lang</groupId>
195-
<artifactId>commons-lang</artifactId>
196-
<version>${commons-lang.version}</version>
197-
<scope>test</scope>
198-
</dependency>
199-
<dependency>
200-
<groupId>org.springframework</groupId>
201-
<artifactId>spring-test</artifactId>
202-
<version>${spring.version}</version>
203-
<scope>test</scope>
204-
</dependency>
205-
<dependency>
206-
<groupId>org.mockito</groupId>
207-
<artifactId>mockito-core</artifactId>
208-
<version>${mockito.version}</version>
209-
<scope>test</scope>
210-
</dependency>
211141
</dependencies>
212142
</dependencyManagement>
213143

‎jprotoc/jprotoc-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<artifactId>jprotoc-parent</artifactId>
1414
<groupId>com.salesforce.servicelibs</groupId>
15-
<version>0.8.2-SNAPSHOT</version>
15+
<version>0.9.0</version>
1616
</parent>
1717
<modelVersion>4.0.0</modelVersion>
1818

‎jprotoc/jprotoc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<artifactId>jprotoc-parent</artifactId>
1414
<groupId>com.salesforce.servicelibs</groupId>
15-
<version>0.8.2-SNAPSHOT</version>
15+
<version>0.9.0</version>
1616
</parent>
1717
<modelVersion>4.0.0</modelVersion>
1818

‎jprotoc/pom.xml‎

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<groupId>com.salesforce.servicelibs</groupId>
1515
<artifactId>jprotoc-parent</artifactId>
1616
<packaging>pom</packaging>
17-
<version>0.8.2-SNAPSHOT</version>
17+
<version>0.9.0</version>
1818

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

@@ -56,6 +56,8 @@
5656
<mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
5757

5858
<!-- Dependency Versions -->
59+
<contrib.version>0.8.1</contrib.version>
60+
5961
<grpc.version>1.12.0</grpc.version>
6062
<protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
6163
<slf4j.version>1.7.21</slf4j.version>
@@ -94,12 +96,7 @@
9496
<dependency>
9597
<groupId>com.salesforce.servicelibs</groupId>
9698
<artifactId>grpc-contrib</artifactId>
97-
<version>${project.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>com.salesforce.servicelibs</groupId>
101-
<artifactId>grpc-spring</artifactId>
102-
<version>${project.version}</version>
99+
<version>${contrib.version}</version>
103100
</dependency>
104101
<dependency>
105102
<groupId>com.salesforce.servicelibs</groupId>
@@ -121,11 +118,6 @@
121118
<artifactId>grpc-core</artifactId>
122119
<version>${grpc.version}</version>
123120
</dependency>
124-
<dependency>
125-
<groupId>io.grpc</groupId>
126-
<artifactId>grpc-context</artifactId>
127-
<version>${grpc.version}</version>
128-
</dependency>
129121
<dependency>
130122
<groupId>io.grpc</groupId>
131123
<artifactId>grpc-stub</artifactId>
@@ -136,16 +128,6 @@
136128
<artifactId>compiler</artifactId>
137129
<version>${mustache-java.version}</version>
138130
</dependency>
139-
<dependency>
140-
<groupId>org.springframework</groupId>
141-
<artifactId>spring-context</artifactId>
142-
<version>${spring.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.springframework</groupId>
146-
<artifactId>spring-webmvc</artifactId>
147-
<version>${spring.version}</version>
148-
</dependency>
149131
<!-- Provided dependencies -->
150132
<dependency>
151133
<groupId>org.slf4j</groupId>
@@ -160,18 +142,6 @@
160142
<scope>provided</scope>
161143
</dependency>
162144
<!-- Test dependencies -->
163-
<dependency>
164-
<groupId>io.grpc</groupId>
165-
<artifactId>grpc-testing</artifactId>
166-
<version>${grpc.version}</version>
167-
<scope>test</scope>
168-
</dependency>
169-
<dependency>
170-
<groupId>io.grpc</groupId>
171-
<artifactId>grpc-testing-proto</artifactId>
172-
<version>${grpc.version}</version>
173-
<scope>test</scope>
174-
</dependency>
175145
<dependency>
176146
<groupId>junit</groupId>
177147
<artifactId>junit</artifactId>
@@ -196,18 +166,6 @@
196166
<version>${commons-lang.version}</version>
197167
<scope>test</scope>
198168
</dependency>
199-
<dependency>
200-
<groupId>org.springframework</groupId>
201-
<artifactId>spring-test</artifactId>
202-
<version>${spring.version}</version>
203-
<scope>test</scope>
204-
</dependency>
205-
<dependency>
206-
<groupId>org.mockito</groupId>
207-
<artifactId>mockito-core</artifactId>
208-
<version>${mockito.version}</version>
209-
<scope>test</scope>
210-
</dependency>
211169
</dependencies>
212170
</dependencyManagement>
213171

0 commit comments

Comments
 (0)