Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions .github/workflows/sdk-platform-java-sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,18 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Install modules to local maven
run: |
mvn install -T 1C -DskipTests -ntp -B
cd java-showcase
mvn install -T 1C -DskipTests -ntp -B
- name: Install sdk-platform-modules
shell: bash
run: .kokoro/build.sh
env:
BUILD_SUBDIR: sdk-platform-java
JOB_TYPE: install
- name: Install java-showcase
shell: bash
run: mvn install -T 1C -DskipTests -ntp -B
working-directory: sdk-platform-java/java-showcase
- name: Parse showcase version
working-directory: java-showcase/gapic-showcase
working-directory: sdk-platform-java/java-showcase/gapic-showcase
run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
- name: Install showcase server
run: |
Expand All @@ -79,6 +84,7 @@ jobs:
-Dsonar.projectKey=googleapis_gapic-generator-java \
-Dsonar.organization=googleapis \
-Dsonar.host.url=https://sonarcloud.io
working-directory: sdk-platform-java
- name: Build and analyze Showcase Integration Tests Coverage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand All @@ -93,3 +99,4 @@ jobs:
-Dsonar.organization=googleapis \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.projectName=java_showcase_integration_tests
working-directory: sdk-platform-java
2 changes: 1 addition & 1 deletion sdk-platform-java/GEMINI.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ Showcase integration tests are run against a local server that implements the Sh
- **Issues:** All significant changes should start with a GitHub issue.
- **Pull Requests:** All code changes must be submitted via a pull request and require review. Before creating a PR, always pull latest from main, merge main to local branch and resolve any conflicts.
- **Testing:** All new logic should be accompanied by tests.
- For more details, see `CONTRIBUTING.md`.
- For more details, see `CONTRIBUTING.md`.
1 change: 0 additions & 1 deletion sdk-platform-java/dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2
io.grpc:grpc-bom,grpc=1.80.0
com.google.auth:google-auth-library-bom,google.auth=1.46.0
com.google.http-client:google-http-client,google.http-client=2.1.0
com.google.code.gson:gson,gson=2.13.2
com.google.guava:guava,guava=33.5.0-jre
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.google.protobuf.Option;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.slf4j.Logger;
Expand All @@ -56,6 +57,7 @@ class Slf4jUtilsTest {

// This test should only run GOOGLE_SDK_JAVA_LOGGING != true
@Test
@Disabled("See https://github.com/googleapis/google-cloud-java/issues/12828")
void testGetLogger_loggingDisabled_shouldGetNOPLogger() {
Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class);
assertEquals(NOPLogger.class, logger.getClass());
Expand Down
14 changes: 3 additions & 11 deletions settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<!-- Google's Maven Central mirror for Americas
https://maven-central.storage.googleapis.com/index.html
-->
<id>google-maven-central</id>
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<!-- This file contains settings used by .kokoro/build.sh. These are global
configs used by almost every build script.
-->
</settings>
Loading