Skip to content

refactor: Extract shared GitHubTools into its own sample module #1306

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

Merged
copybara-service merged 1 commit into from
Jun 25, 2026
+125 −421
Merged

refactor: Extract shared GitHubTools into its own sample module #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 9 additions & 85 deletions contrib/samples/github/adkprtriaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
<!-- Main class for exec-maven-plugin -->
<exec.mainClass>com.example.adkprtriaging.AdkPrTriagingAgentRun</exec.mainClass>
<google-adk.version>${project.version}</google-adk.version>
<!-- Helper/sample module: not published to Maven Central. -->
<skipPublishing>true</skipPublishing>
</properties>

<dependencies>
Expand All @@ -49,27 +51,21 @@
<artifactId>google-adk</artifactId>
<version>${google-adk.version}</version>
</dependency>
<!-- GitHub REST API client used by the shared GitHubTools, so we don't hand-roll one. -->
<!-- Shared GitHubTools (wraps the org.kohsuke github-api). -->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.330</version>
<groupId>com.google.adk.samples</groupId>
<artifactId>google-adk-sample-github-tools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<!-- Logging backend so console output works in both interactive and workflow modes. -->
<!-- Logging backend for console output. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies (versions managed by the parent POM's junit-bom and
dependencyManagement). -->
<!-- Test dependencies (versions from the parent POM). -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -101,81 +97,9 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<!-- Preserve parameter names so FunctionTool can introspect them without
forcing every parameter to be annotated. -->
<!-- Preserve parameter names for FunctionTool introspection. -->
<parameters>true</parameters>
</configuration>
<executions>
<!-- The shared github/ directory is on the source path (see build-helper
below), so restrict the main compile to this sample's files plus the
shared GitHubTools.java; otherwise the sibling samples and this module's
own test sources under github/ would also be compiled here. -->
<execution>
<id>default-compile</id>
<configuration>
<includes>
<include>GitHubTools.java</include>
<include>adkprtriaging/*.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<!-- Compile this sample plus the shared GitHubTools.java that
lives in the parent github/ directory (no extra module). -->
<source>..</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<!-- The github/ source root recursively includes sibling samples and this
module's test sources; keep them out of the -Prelease sources jar. -->
<excludes>
<exclude>**/*.jar</exclude>
<exclude>**/*.yml</exclude>
<exclude>adktriaging/**</exclude>
<exclude>adkreleasedocs/**</exclude>
<exclude>adkspam/**</exclude>
<exclude>adkstale/**</exclude>
<exclude>**/src/test/**</exclude>
<exclude>target/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Mirror the source/compile excludes above: the github/ source root pulls in
sibling samples and test sources, whose (test-scoped) dependencies are not
on the Javadoc classpath, so the -Prelease attach-javadocs goal would
otherwise fail. -->
<sourceFileExcludes>
<sourceFileExclude>adktriaging/**</sourceFileExclude>
<sourceFileExclude>adkreleasedocs/**</sourceFileExclude>
<sourceFileExclude>adkspam/**</sourceFileExclude>
<sourceFileExclude>adkstale/**</sourceFileExclude>
<sourceFileExclude>**/src/test/**</sourceFileExclude>
</sourceFileExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
0 ...hub/adkprtriaging/AdkPrTriagingAgent.java → ...ple/adkprtriaging/AdkPrTriagingAgent.java
View file
Open in desktop
File renamed without changes.
0 .../adkprtriaging/AdkPrTriagingAgentRun.java → .../adkprtriaging/AdkPrTriagingAgentRun.java
View file
Open in desktop
File renamed without changes.
0 ...amples/github/adkprtriaging/Settings.java → ...a/com/example/adkprtriaging/Settings.java
View file
Open in desktop
File renamed without changes.
84 changes: 7 additions & 77 deletions contrib/samples/github/adkreleasedocs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
<!-- Main class for exec-maven-plugin -->
<exec.mainClass>com.example.adkdocs.AdkDocsReleaseAnalyzerRun</exec.mainClass>
<google-adk.version>${project.version}</google-adk.version>
<!-- Helper/sample module: not published to Maven Central. -->
<skipPublishing>true</skipPublishing>
</properties>

<dependencies>
Expand All @@ -48,23 +50,18 @@
<artifactId>google-adk</artifactId>
<version>${google-adk.version}</version>
</dependency>
<!-- GitHub REST API client, so we don't hand-roll one. -->
<!-- Shared GitHubTools (wraps the org.kohsuke github-api). -->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.330</version>
<groupId>com.google.adk.samples</groupId>
<artifactId>google-adk-sample-github-tools</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Command-line argument parsing. -->
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
</dependencies>

<build>
Expand All @@ -76,76 +73,9 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<!-- Preserve parameter names for FunctionTool introspection. -->
<parameters>true</parameters>
</configuration>
<executions>
<!-- The shared github/ directory is on the source path (see build-helper
below), so restrict the main compile to this sample's files plus the
shared GitHubTools.java; otherwise sibling samples under github/ would
also be compiled into this module. -->
<execution>
<id>default-compile</id>
<configuration>
<includes>
<include>GitHubTools.java</include>
<include>adkreleasedocs/*.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<!-- Compile this sample plus the shared GitHubTools.java that
lives in the parent github/ directory (no extra module). -->
<source>..</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<!-- The github/ source root recursively includes sibling samples; keep them
out of this module's -Prelease sources jar. -->
<excludes>
<exclude>**/*.jar</exclude>
<exclude>adkprtriaging/**</exclude>
<exclude>adkspam/**</exclude>
<exclude>adkstale/**</exclude>
<exclude>adktriaging/**</exclude>
<exclude>target/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Mirror the source excludes: the github/ source root pulls in sibling
samples (with their own, possibly test-scoped, dependencies) that are not
on this module's Javadoc classpath, so the -Prelease attach-javadocs goal
would otherwise fail. -->
<sourceFileExcludes>
<sourceFileExclude>adkprtriaging/**</sourceFileExclude>
<sourceFileExclude>adkspam/**</sourceFileExclude>
<sourceFileExclude>adkstale/**</sourceFileExclude>
<sourceFileExclude>adktriaging/**</sourceFileExclude>
</sourceFileExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
0 ...easedocs/AdkDocsReleaseAnalyzerAgent.java → .../adkdocs/AdkDocsReleaseAnalyzerAgent.java
View file
Open in desktop
File renamed without changes.
0 ...eleasedocs/AdkDocsReleaseAnalyzerRun.java → ...le/adkdocs/AdkDocsReleaseAnalyzerRun.java
View file
Open in desktop
File renamed without changes.
0 ...mples/github/adkreleasedocs/Settings.java → ...in/java/com/example/adkdocs/Settings.java
View file
Open in desktop
File renamed without changes.
94 changes: 9 additions & 85 deletions contrib/samples/github/adkspam/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<!-- Main class for exec-maven-plugin -->
<exec.mainClass>com.example.adkspam.SpamDetectionAgentRun</exec.mainClass>
<google-adk.version>${project.version}</google-adk.version>
<!-- Helper/sample module: not published to Maven Central. -->
<skipPublishing>true</skipPublishing>
</properties>

<dependencies>
Expand All @@ -50,27 +52,21 @@
<artifactId>google-adk</artifactId>
<version>${google-adk.version}</version>
</dependency>
<!-- GitHub REST API client used by the shared GitHubTools, so we don't hand-roll one. -->
<!-- Shared GitHubTools (wraps the org.kohsuke github-api). -->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.330</version>
<groupId>com.google.adk.samples</groupId>
<artifactId>google-adk-sample-github-tools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<!-- Logging backend so console output works in both interactive and workflow modes. -->
<!-- Logging backend for console output. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies (versions managed by the parent POM's junit-bom and
dependencyManagement). -->
<!-- Test dependencies (versions from the parent POM). -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -102,81 +98,9 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<!-- Preserve parameter names so FunctionTool can introspect them without
forcing every parameter to be annotated. -->
<!-- Preserve parameter names for FunctionTool introspection. -->
<parameters>true</parameters>
</configuration>
<executions>
<!-- The shared github/ directory is on the source path (see build-helper
below), so restrict the main compile to this sample's files plus the
shared GitHubTools.java; otherwise the sibling samples and this module's
own test sources under github/ would also be compiled here. -->
<execution>
<id>default-compile</id>
<configuration>
<includes>
<include>GitHubTools.java</include>
<include>adkspam/*.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<!-- Compile this sample plus the shared GitHubTools.java that
lives in the parent github/ directory (no extra module). -->
<source>..</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<!-- The github/ source root recursively includes sibling samples and this
module's test sources; keep them out of the -Prelease sources jar. -->
<excludes>
<exclude>**/*.jar</exclude>
<exclude>**/*.yml</exclude>
<exclude>adkprtriaging/**</exclude>
<exclude>adkreleasedocs/**</exclude>
<exclude>adkstale/**</exclude>
<exclude>adktriaging/**</exclude>
<exclude>**/src/test/**</exclude>
<exclude>target/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Mirror the source/compile excludes above: the github/ source root pulls in
sibling samples and test sources, whose (test-scoped) dependencies are not
on the Javadoc classpath, so the -Prelease attach-javadocs goal would
otherwise fail. -->
<sourceFileExcludes>
<sourceFileExclude>adkprtriaging/**</sourceFileExclude>
<sourceFileExclude>adkreleasedocs/**</sourceFileExclude>
<sourceFileExclude>adkstale/**</sourceFileExclude>
<sourceFileExclude>adktriaging/**</sourceFileExclude>
<sourceFileExclude>**/src/test/**</sourceFileExclude>
</sourceFileExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
0 contrib/samples/github/adkspam/Settings.java → ...in/java/com/example/adkspam/Settings.java
View file
Open in desktop
File renamed without changes.
0 ...es/github/adkspam/SpamDetectionAgent.java → ...m/example/adkspam/SpamDetectionAgent.java
View file
Open in desktop
File renamed without changes.
0 ...github/adkspam/SpamDetectionAgentRun.java → ...xample/adkspam/SpamDetectionAgentRun.java
View file
Open in desktop
File renamed without changes.
Loading
Loading