Skip to content
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.

Sign up for GitHub

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

chore: update logging mod #3709

Merged
merged 5 commits into from
Mar 18, 2025
Merged

chore: update logging mod #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
053b4aa
chore: change group id
JoeWang1127 Mar 18, 2025
3f502f7
chore: change group id
JoeWang1127 Mar 18, 2025
382968c
chore: change group id
JoeWang1127 Mar 18, 2025
4387cfe
add ci
JoeWang1127 Mar 18, 2025
3004bd3
change header path
JoeWang1127 Mar 18, 2025
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
30 changes: 30 additions & 0 deletions .github/workflows/java_sdk_logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,33 @@ jobs:
run: |
mvn -B -ntp fmt:check
working-directory: java-sdk-logging
module-clirr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
- name: Install parent module
run: |
mvn install -B -ntp -pl gapic-generator-java-pom-parent
- name: Clirr check
run: |
mvn -B -ntp -Denforcer.skip=true clirr:check
working-directory: java-sdk-logging
module-enforcer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
- name: Install parent module
run: |
mvn install -B -ntp -pl gapic-generator-java-pom-parent
- name: Enforcer check
run: |
mvn -B -ntp enforcer:enforce@enforce -T 1C
working-directory: java-sdk-logging
2 changes: 1 addition & 1 deletion java-sdk-logging/license-checks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<module name="Checker">
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value="./java-sdk-logging/java.header"/>
<property name="headerFile" value="./java.header"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a separate topic: why do we have a java.header file in each submodule? I think we can have one under root, and all submodules reference it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a follow up PR to create a java.header in root.

</module>
</module>
2 changes: 1 addition & 1 deletion java-sdk-logging/log4j2-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.google.api</groupId>
<groupId>com.google.cloud</groupId>
<artifactId>java-sdk-logging-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
Expand Down
2 changes: 1 addition & 1 deletion java-sdk-logging/logback-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.google.api</groupId>
<groupId>com.google.cloud</groupId>
<artifactId>java-sdk-logging-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
Expand Down
1 change: 1 addition & 0 deletions java-sdk-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>java-sdk-logging-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down
Loading