Skip to content

Commit 0bb2a75

Browse files
chingor13chingor13
committed
manual changes
1 parent e64b945 commit 0bb2a75

File tree

4 files changed

+35
-263
lines changed

4 files changed

+35
-263
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/bom/pom.xml‎

Lines changed: 28 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -5,173 +5,41 @@
55
<artifactId>google-auth-library-bom</artifactId>
66
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
77
<packaging>pom</packaging>
8+
9+
<parent>
10+
<groupId>com.google.cloud</groupId>
11+
<artifactId>google-cloud-pom-parent</artifactId>
12+
<version>1.83.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
13+
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
14+
</parent>
15+
816
<name>Google Auth Library for Java BOM</name>
917
<description>
1018
BOM for Google Auth Library for Java
1119
</description>
12-
<url>https://github.com/googleapis/google-cloud-java</url>
13-
14-
<distributionManagement>
15-
<snapshotRepository>
16-
<id>sonatype-nexus-snapshots</id>
17-
<url>https://google.oss.sonatype.org/content/repositories/snapshots</url>
18-
</snapshotRepository>
19-
</distributionManagement>
20-
21-
<licenses>
22-
<license>
23-
<name>Apache-2.0</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
25-
<distribution>repo</distribution>
26-
</license>
27-
</licenses>
28-
29-
<organization>
30-
<name>Google</name>
31-
<url>http://www.google.com/</url>
32-
</organization>
33-
34-
<scm>
35-
<connection>scm:git:https://github.com/googleapis/google-cloud-java.git</connection>
36-
<developerConnection>scm:git:https://github.com/googleapis/google-cloud-java.git</developerConnection>
37-
<url>https://github.com/googleapis/google-cloud-java</url>
38-
</scm>
39-
40-
<developers>
41-
<developer>
42-
<name>Jeff Ching</name>
43-
<email>chingor@google.com</email>
44-
<roles>
45-
<role>developer</role>
46-
</roles>
47-
</developer>
48-
</developers>
4920

5021
<dependencyManagement>
5122
<dependencies>
23+
<dependency>
24+
<groupId>com.google.auth</groupId>
25+
<artifactId>google-auth-library-credentials</artifactId>
26+
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
27+
</dependency>
28+
<dependency>
29+
<groupId>com.google.auth</groupId>
30+
<artifactId>google-auth-library-oauth2-http</artifactId>
31+
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
32+
</dependency>
33+
<dependency>
34+
<groupId>com.google.auth</groupId>
35+
<artifactId>google-auth-library-appengine</artifactId>
36+
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
37+
</dependency>
38+
<dependency>
39+
<groupId>com.google.auth</groupId>
40+
<artifactId>google-auth-library-cab-token-generator</artifactId>
41+
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
42+
</dependency>
5243
</dependencies>
5344
</dependencyManagement>
54-
55-
<build>
56-
<pluginManagement>
57-
<plugins>
58-
<plugin>
59-
<groupId>org.sonatype.plugins</groupId>
60-
<artifactId>nexus-staging-maven-plugin</artifactId>
61-
<version>1.7.0</version>
62-
<extensions>true</extensions>
63-
<configuration>
64-
<serverId>ossrh</serverId>
65-
<nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
66-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
67-
</configuration>
68-
</plugin>
69-
</plugins>
70-
</pluginManagement>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-javadoc-plugin</artifactId>
75-
<version>3.11.2</version>
76-
<configuration>
77-
<skip>true</skip>
78-
</configuration>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-site-plugin</artifactId>
83-
<version>3.21.0</version>
84-
<configuration>
85-
<skip>true</skip>
86-
</configuration>
87-
</plugin>
88-
89-
<plugin>
90-
<groupId>com.spotify.fmt</groupId>
91-
<artifactId>fmt-maven-plugin</artifactId>
92-
<version>2.25</version>
93-
<configuration>
94-
<verbose>true</verbose>
95-
</configuration>
96-
</plugin>
97-
</plugins>
98-
</build>
99-
100-
<profiles>
101-
<profile>
102-
<!-- By default, we release artifacts to Sonatype, which requires
103-
nexus-staging-maven-plugin. -->
104-
<id>release-sonatype</id>
105-
<activation>
106-
<property>
107-
<!-- Only when we use the release-gcp-artifact-registry profile,
108-
which comes with artifact-registry-url property, this profile is
109-
turned off. -->
110-
<name>!artifact-registry-url</name>
111-
</property>
112-
</activation>
113-
<build>
114-
<plugins>
115-
<plugin>
116-
<groupId>org.sonatype.plugins</groupId>
117-
<artifactId>nexus-staging-maven-plugin</artifactId>
118-
</plugin>
119-
</plugins>
120-
</build>
121-
</profile>
122-
<profile>
123-
<!-- Optionally, we can publish the artifacts to GCP Artifact Registry specifying
124-
this release-gcp-artifact-registry profile:
125-
mvn deploy -P=release-gcp-artifact-registry -P=-release-sonatype \
126-
-Dartifact-registry-url=artifactregistry://us-maven.pkg.dev/...
127-
-->
128-
<id>release-gcp-artifact-registry</id>
129-
<properties>
130-
<artifact-registry-url>artifactregistry://undefined-artifact-registry-url-value</artifact-registry-url>
131-
</properties>
132-
<distributionManagement>
133-
<repository>
134-
<id>gcp-artifact-registry-repository</id>
135-
<url>${artifact-registry-url}</url>
136-
</repository>
137-
<snapshotRepository>
138-
<id>gcp-artifact-registry-repository</id>
139-
<url>${artifact-registry-url}</url>
140-
</snapshotRepository>
141-
</distributionManagement>
142-
</profile>
143-
<profile>
144-
<id>release-sign-artifacts</id>
145-
<activation>
146-
<property>
147-
<name>performRelease</name>
148-
<value>true</value>
149-
</property>
150-
</activation>
151-
<build>
152-
<plugins>
153-
<plugin>
154-
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-gpg-plugin</artifactId>
156-
<version>3.2.7</version>
157-
<executions>
158-
<execution>
159-
<id>sign-artifacts</id>
160-
<phase>verify</phase>
161-
<goals>
162-
<goal>sign</goal>
163-
</goals>
164-
<configuration>
165-
<gpgArguments>
166-
<arg>--pinentry-mode</arg>
167-
<arg>loopback</arg>
168-
</gpgArguments>
169-
</configuration>
170-
</execution>
171-
</executions>
172-
</plugin>
173-
</plugins>
174-
</build>
175-
</profile>
176-
</profiles>
17745
</project>

‎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)