Skip to content

Commit a60c1b6

Browse files
chingor13elharo
andauthored
feat: configure initial sp version (#1360)
* feat: configure initial sp version * build: update protoc plugin (#1341) Co-authored-by: Elliotte Rusty Harold <elharo@users.noreply.github.com>
1 parent 5e9b2f1 commit a60c1b6

File tree

3 files changed

+68
-64
lines changed

3 files changed

+68
-64
lines changed

.github/workflows/ci.yaml

Lines changed: 65 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,91 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- master
5-
pull_request:
4+
- 1.39.2-sp
5+
pull_request: null
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 8, 11]
12+
java:
13+
- 7
14+
- 8
15+
- 11
1316
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-java@v1
16-
with:
17-
java-version: ${{matrix.java}}
18-
- run: java -version
19-
- run: .kokoro/build.sh
20-
env:
21-
JOB_TYPE: test
22-
- name: coverage
23-
uses: codecov/codecov-action@v1
24-
with:
25-
name: actions ${{matrix.java}}
17+
- uses: actions/checkout@v2
18+
- uses: actions/setup-java@v1
19+
with:
20+
java-version: ${{matrix.java}}
21+
- run: java -version
22+
- run: .kokoro/build.sh
23+
env:
24+
JOB_TYPE: test
25+
- name: coverage
26+
uses: codecov/codecov-action@v1
27+
with:
28+
name: actions ${{matrix.java}}
2629
windows:
2730
runs-on: windows-latest
2831
steps:
29-
- uses: actions/checkout@v2
30-
- uses: actions/setup-java@v1
31-
with:
32-
java-version: 8
33-
- run: java -version
34-
- run: .kokoro/build.bat
35-
env:
36-
JOB_TYPE: test
32+
- uses: actions/checkout@v2
33+
- uses: actions/setup-java@v1
34+
with:
35+
java-version: 8
36+
- run: java -version
37+
- run: .kokoro/build.bat
38+
env:
39+
JOB_TYPE: test
3740
dependencies:
3841
runs-on: ubuntu-latest
3942
strategy:
4043
matrix:
41-
java: [8, 11]
44+
java:
45+
- 8
46+
- 11
4247
steps:
43-
- uses: actions/checkout@v2
44-
- uses: actions/setup-java@v1
45-
with:
46-
java-version: ${{matrix.java}}
47-
- run: java -version
48-
- run: .kokoro/dependencies.sh
48+
- uses: actions/checkout@v2
49+
- uses: actions/setup-java@v1
50+
with:
51+
java-version: ${{matrix.java}}
52+
- run: java -version
53+
- run: .kokoro/dependencies.sh
4954
linkage-monitor:
5055
runs-on: ubuntu-latest
5156
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/setup-java@v1
54-
with:
55-
java-version: 8
56-
- run: java -version
57-
- name: Install artifacts to local Maven repository
58-
run: .kokoro/build.sh
59-
shell: bash
60-
- name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
61-
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
57+
- uses: actions/checkout@v2
58+
- uses: actions/setup-java@v1
59+
with:
60+
java-version: 8
61+
- run: java -version
62+
- name: Install artifacts to local Maven repository
63+
run: .kokoro/build.sh
64+
shell: bash
65+
- name: >-
66+
Validate any conflicts with regard to com.google.cloud:libraries-bom
67+
(latest release)
68+
uses: >-
69+
GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
6270
lint:
6371
runs-on: ubuntu-latest
6472
steps:
65-
- uses: actions/checkout@v2
66-
- uses: actions/setup-java@v1
67-
with:
68-
java-version: 8
69-
- run: java -version
70-
- run: .kokoro/build.sh
71-
env:
72-
JOB_TYPE: lint
73+
- uses: actions/checkout@v2
74+
- uses: actions/setup-java@v1
75+
with:
76+
java-version: 8
77+
- run: java -version
78+
- run: .kokoro/build.sh
79+
env:
80+
JOB_TYPE: lint
7381
clirr:
7482
runs-on: ubuntu-latest
7583
steps:
76-
- uses: actions/checkout@v2
77-
- uses: actions/setup-java@v1
78-
with:
79-
java-version: 8
80-
- run: java -version
81-
- run: .kokoro/build.sh
82-
env:
83-
JOB_TYPE: clirr
84+
- uses: actions/checkout@v2
85+
- uses: actions/setup-java@v1
86+
with:
87+
java-version: 8
88+
- run: java -version
89+
- run: .kokoro/build.sh
90+
env:
91+
JOB_TYPE: clirr

google-http-client-protobuf/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
</executions>
4444
</plugin>
4545
<plugin>
46-
<groupId>com.google.protobuf.tools</groupId>
47-
<artifactId>maven-protoc-plugin</artifactId>
48-
<version>0.4.2</version>
46+
<groupId>org.xolstice.maven.plugins</groupId>
47+
<artifactId>protobuf-maven-plugin</artifactId>
48+
<version>0.6.1</version>
4949
<configuration>
5050
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
5151
</configuration>

pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@
8787
<name>Central Repository</name>
8888
<url>https://repo.maven.apache.org/maven2</url>
8989
</pluginRepository>
90-
<pluginRepository>
91-
<id>protoc-plugin</id>
92-
<url>https://dl.bintray.com/sergei-ivanov/maven/</url>
93-
</pluginRepository>
9490
</pluginRepositories>
9591

9692
<!--

0 commit comments

Comments
 (0)