-
Notifications
You must be signed in to change notification settings - Fork 1.1k
chore(java-shared-config): migrate java-shared-config into monorepo and integrate parent POM #13339
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
jinseopkim0
wants to merge
2
commits into
main
Choose a base branch
from
migrate-java-shared-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| # Copyright 2022 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # Github action job to test core java library features on | ||
| # downstream client libraries before they are released. | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| name: java-shared-config ci | ||
| env: | ||
| BUILD_SUBDIR: java-shared-config | ||
| jobs: | ||
| filter: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| library: ${{ steps.filter.outputs.library }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: dorny/paths-filter@v3 | ||
| id: filter | ||
| with: | ||
| filters: | | ||
| library: | ||
| - 'java-shared-config/**' | ||
| units: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: [11, 17, 21] | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| units-java8: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| # Building using Java 17 and run the tests with Java 8 runtime | ||
| name: "units (8)" | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 11 | ||
| distribution: temurin | ||
| - name: "Set jvm system property environment variable for surefire plugin (unit tests)" | ||
| # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. | ||
| # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm | ||
| run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV | ||
| shell: bash | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 17 | ||
| distribution: temurin | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| windows: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: windows-latest | ||
| steps: | ||
| - name: Support longpaths | ||
| run: git config --system core.longpaths true | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 11 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| dependencies: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| java: [17] | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/dependencies.sh | ||
| javadoc: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: javadoc | ||
| lint: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 11 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: lint | ||
| HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} | ||
| BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }} | ||
| clirr: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 11 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: clirr | ||
| BUILD_SUBDIR: java-shared-config |
63 changes: 63 additions & 0 deletions
63
.github/workflows/java-shared-config-downstream-dependencies.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| name: java-shared-config downstream | ||
| env: | ||
| BUILD_SUBDIR: java-shared-config | ||
| jobs: | ||
| filter: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| library: ${{ steps.filter.outputs.library }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: dorny/paths-filter@v3 | ||
| id: filter | ||
| with: | ||
| filters: | | ||
| library: | ||
| - 'java-shared-config/**' | ||
| dependencies: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: [11] | ||
| repo: | ||
| - java-bigquery | ||
| - java-bigquerystorage | ||
| - java-spanner | ||
| - java-storage | ||
| - java-pubsub | ||
| steps: | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: sudo apt-get update -y | ||
| - run: sudo apt-get install libxml2-utils | ||
| - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies | ||
|
|
||
| flatten-plugin-check: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: 11 | ||
| - run: java -version | ||
| - run: sudo apt-get update -y | ||
| - run: sudo apt-get install libxml2-utils | ||
| - run: .kokoro/client-library-check.sh java-storage flatten-plugin | ||
| env: | ||
| REPO_TAG: v2.9.3 | ||
| EXPECTED_DEPENDENCIES_LIST: java-storage-v2.9.3-expected-flattened-dependencies.txt |
107 changes: 107 additions & 0 deletions
107
.github/workflows/java-shared-config-downstream-maven-plugins.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
|
|
||
| # Keeping this file separate as the dependencies check would use more | ||
| # repositories than needed this downstream check for GraalVM native image and | ||
| # other Maven plugins. | ||
| name: java-shared-config downstream | ||
| env: | ||
| BUILD_SUBDIR: java-shared-config | ||
| jobs: | ||
| filter: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| library: ${{ steps.filter.outputs.library }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: dorny/paths-filter@v3 | ||
| id: filter | ||
| with: | ||
| filters: | | ||
| library: | ||
| - 'java-shared-config/**' | ||
| build: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: [8, 11] | ||
| repo: | ||
| - java-bigquery | ||
| - java-bigtable | ||
| job-type: | ||
| - test # maven-surefire-plugin | ||
| - clirr # clirr-maven-plugin | ||
| - javadoc # maven-javadoc-plugin | ||
| - javadoc-with-doclet # test javadoc generation with doclet | ||
| steps: | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: sudo apt-get update -y | ||
| - run: sudo apt-get install libxml2-utils | ||
| - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} | ||
| lint: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: [17, 21] | ||
| repo: | ||
| - java-bigquery | ||
| - java-bigtable | ||
| job-type: | ||
| - lint # fmt-maven-plugin and google-java-format | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: sudo apt-get update -y | ||
| - run: sudo apt-get install libxml2-utils | ||
| - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} | ||
| javadoc-with-doclet: | ||
| needs: filter | ||
| if: ${{ needs.filter.outputs.library == 'true' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| repo: | ||
| - java-bigtable | ||
| - java-bigquery | ||
| - java-storage | ||
| - java-storage-nio | ||
| - java-spanner | ||
| - java-spanner-jdbc | ||
| - java-pubsub | ||
| - java-pubsublite | ||
| - java-logging | ||
| - java-logging-logback | ||
| - java-firestore | ||
| - java-datastore | ||
| - java-bigquerystorage | ||
| steps: | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: sudo apt-get update -y | ||
| - run: sudo apt-get install libxml2-utils | ||
| - run: .kokoro/client-library-check-doclet.sh ${{matrix.repo}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a duplicate team reference
@googleapis/cloud-sdk-java-teamon this line. It should be@googleapis/cloud-sdk-librarian-teaminstead, matching the pattern of the other entries in this file.