Skip to content

Commit fef4260

Browse files
committed
chore(google-auth-library-java): apply manual changes
1 parent 4694220 commit fef4260

File tree

3 files changed

+7
-103
lines changed

3 files changed

+7
-103
lines changed

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ jobs:
173173
|grep --invert-match 'java/com/google' \
174174
|grep --invert-match '/test/' \
175175
|grep --invert-match '/tests/' \
176+
|grep --invert-match '/javatests/' \
176177
|grep --invert-match samples \
177178
|grep --invert-match benchmark \
178179
|grep --invert-match grafeas \

.github/workflows/google-auth-library-java-ci.yaml

Lines changed: 2 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,6 @@ jobs:
3434
filters: |
3535
library:
3636
- 'google-auth-library-java/**'
37-
units:
38-
needs: filter
39-
if: ${{ needs.filter.outputs.library == 'true' }}
40-
runs-on: ubuntu-latest
41-
strategy:
42-
fail-fast: false
43-
matrix:
44-
java: [11, 17, 21, 25]
45-
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-java@v4
48-
with:
49-
distribution: temurin
50-
java-version: ${{matrix.java}}
51-
- run: java -version
52-
- run: .kokoro/build.sh
53-
env:
54-
JOB_TYPE: test
5537
units-logging:
5638
needs: filter
5739
if: ${{ needs.filter.outputs.library == 'true' }}
@@ -69,89 +51,6 @@ jobs:
6951
- run: java -version
7052
- run: .kokoro/build.sh
7153
env:
72-
JOB_TYPE: test-logging
73-
units-java8:
74-
needs: filter
75-
if: ${{ needs.filter.outputs.library == 'true' }}
76-
# Building using Java 17 and run the tests with Java 8 runtime
77-
name: "units (8)"
78-
runs-on: ubuntu-latest
79-
steps:
80-
- uses: actions/checkout@v4
81-
- uses: actions/setup-java@v4
82-
with:
83-
java-version: 8
84-
distribution: temurin
85-
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
86-
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
87-
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
88-
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV
89-
shell: bash
90-
- uses: actions/setup-java@v4
91-
with:
92-
java-version: 17
93-
distribution: temurin
94-
- run: .kokoro/build.sh
95-
env:
96-
JOB_TYPE: test
97-
windows:
98-
needs: filter
99-
if: ${{ needs.filter.outputs.library == 'true' }}
100-
runs-on: windows-latest
101-
steps:
102-
- name: Support longpaths
103-
run: git config --system core.longpaths true
104-
- name: Support longpaths
105-
run: git config --system core.longpaths true
106-
- uses: actions/checkout@v4
107-
- uses: actions/setup-java@v4
108-
with:
109-
distribution: temurin
110-
java-version: 8
111-
- run: java -version
112-
- run: .kokoro/build.sh
113-
env:
54+
BUILD_SUBDIR: google-auth-library-java
11455
JOB_TYPE: test
115-
dependencies:
116-
needs: filter
117-
if: ${{ needs.filter.outputs.library == 'true' }}
118-
runs-on: ubuntu-latest
119-
strategy:
120-
matrix:
121-
java: [17]
122-
steps:
123-
- uses: actions/checkout@v4
124-
- uses: actions/setup-java@v4
125-
with:
126-
distribution: temurin
127-
java-version: ${{matrix.java}}
128-
- run: java -version
129-
- run: .kokoro/dependencies.sh
130-
javadoc:
131-
needs: filter
132-
if: ${{ needs.filter.outputs.library == 'true' }}
133-
runs-on: ubuntu-latest
134-
steps:
135-
- uses: actions/checkout@v4
136-
- uses: actions/setup-java@v4
137-
with:
138-
distribution: temurin
139-
java-version: 17
140-
- run: java -version
141-
- run: .kokoro/build.sh
142-
env:
143-
JOB_TYPE: javadoc
144-
lint:
145-
needs: filter
146-
if: ${{ needs.filter.outputs.library == 'true' }}
147-
runs-on: ubuntu-latest
148-
steps:
149-
- uses: actions/checkout@v4
150-
- uses: actions/setup-java@v4
151-
with:
152-
distribution: temurin
153-
java-version: 17
154-
- run: java -version
155-
- run: .kokoro/build.sh
156-
env:
157-
JOB_TYPE: lint
56+
SUREFIRE_JVM_OPT: "-P '!slf4j2x,slf4j2x-test'"

google-auth-library-java/cab-token-generator/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<testSourceDirectory>javatests</testSourceDirectory>
1818
</build>
1919

20+
<properties>
21+
<enforcer.skip>true</enforcer.skip>
22+
</properties>
23+
2024
<dependencies>
2125
<dependency>
2226
<groupId>com.google.auth</groupId>

0 commit comments

Comments
 (0)