From 9831733c9af61ce2fa84afb07a1f007083619067 Mon Sep 17 00:00:00 2001
From: Damian Momot <damianmomot@google.com>
Date: Thu, 25 Jun 2026 04:10:17 -0700
Subject: [PATCH] refactor: Extract shared GitHubTools into its own sample
 module

Replace the build-helper source-root hack (which forced each sample to re-exclude
every sibling in the compiler, source, and javadoc plugins) with a
google-adk-sample-github-tools module that samples depend on under the standard
src/main/java layout.

PiperOrigin-RevId: 937894603
---
 contrib/samples/github/adkprtriaging/pom.xml  | 94 ++----------------
 .../adkprtriaging}/AdkPrTriagingAgent.java    |  0
 .../adkprtriaging}/AdkPrTriagingAgentRun.java |  0
 .../com/example/adkprtriaging}/Settings.java  |  0
 contrib/samples/github/adkreleasedocs/pom.xml | 84 ++--------------
 .../adkdocs}/AdkDocsReleaseAnalyzerAgent.java |  0
 .../adkdocs}/AdkDocsReleaseAnalyzerRun.java   |  0
 .../java/com/example/adkdocs}/Settings.java   |  0
 contrib/samples/github/adkspam/pom.xml        | 94 ++----------------
 .../java/com/example/adkspam}/Settings.java   |  0
 .../example/adkspam}/SpamDetectionAgent.java  |  0
 .../adkspam}/SpamDetectionAgentRun.java       |  0
 contrib/samples/github/adkstale/pom.xml       | 97 ++-----------------
 .../com/example/adkstale}/AdkStaleAgent.java  |  0
 .../example/adkstale}/AdkStaleAgentRun.java   |  0
 .../example/adkstale}/GitHubStaleClient.java  |  0
 .../java/com/example/adkstale}/Settings.java  |  0
 contrib/samples/github/adktriaging/pom.xml    | 94 ++----------------
 .../adktriaging}/AdkTriagingAgent.java        |  0
 .../adktriaging}/AdkTriagingAgentRun.java     |  0
 .../com/example/adktriaging}/Settings.java    |  0
 contrib/samples/github/githubtools/pom.xml    | 78 +++++++++++++++
 .../java/com/example/github}/GitHubTools.java |  0
 contrib/samples/pom.xml                       |  1 +
 pom.xml                                       |  4 +-
 25 files changed, 125 insertions(+), 421 deletions(-)
 rename contrib/samples/github/adkprtriaging/{ => src/main/java/com/example/adkprtriaging}/AdkPrTriagingAgent.java (100%)
 rename contrib/samples/github/adkprtriaging/{ => src/main/java/com/example/adkprtriaging}/AdkPrTriagingAgentRun.java (100%)
 rename contrib/samples/github/adkprtriaging/{ => src/main/java/com/example/adkprtriaging}/Settings.java (100%)
 rename contrib/samples/github/adkreleasedocs/{ => src/main/java/com/example/adkdocs}/AdkDocsReleaseAnalyzerAgent.java (100%)
 rename contrib/samples/github/adkreleasedocs/{ => src/main/java/com/example/adkdocs}/AdkDocsReleaseAnalyzerRun.java (100%)
 rename contrib/samples/github/adkreleasedocs/{ => src/main/java/com/example/adkdocs}/Settings.java (100%)
 rename contrib/samples/github/adkspam/{ => src/main/java/com/example/adkspam}/Settings.java (100%)
 rename contrib/samples/github/adkspam/{ => src/main/java/com/example/adkspam}/SpamDetectionAgent.java (100%)
 rename contrib/samples/github/adkspam/{ => src/main/java/com/example/adkspam}/SpamDetectionAgentRun.java (100%)
 rename contrib/samples/github/adkstale/{ => src/main/java/com/example/adkstale}/AdkStaleAgent.java (100%)
 rename contrib/samples/github/adkstale/{ => src/main/java/com/example/adkstale}/AdkStaleAgentRun.java (100%)
 rename contrib/samples/github/adkstale/{ => src/main/java/com/example/adkstale}/GitHubStaleClient.java (100%)
 rename contrib/samples/github/adkstale/{ => src/main/java/com/example/adkstale}/Settings.java (100%)
 rename contrib/samples/github/adktriaging/{ => src/main/java/com/example/adktriaging}/AdkTriagingAgent.java (100%)
 rename contrib/samples/github/adktriaging/{ => src/main/java/com/example/adktriaging}/AdkTriagingAgentRun.java (100%)
 rename contrib/samples/github/adktriaging/{ => src/main/java/com/example/adktriaging}/Settings.java (100%)
 create mode 100644 contrib/samples/github/githubtools/pom.xml
 rename contrib/samples/github/{ => githubtools/src/main/java/com/example/github}/GitHubTools.java (100%)

diff --git a/contrib/samples/github/adkprtriaging/pom.xml b/contrib/samples/github/adkprtriaging/pom.xml
index 47758d8e0..a398cc894 100644
--- a/contrib/samples/github/adkprtriaging/pom.xml
+++ b/contrib/samples/github/adkprtriaging/pom.xml
@@ -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>
@@ -49,18 +51,13 @@
             <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>
@@ -68,8 +65,7 @@
             <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>
@@ -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>
diff --git a/contrib/samples/github/adkprtriaging/AdkPrTriagingAgent.java b/contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/AdkPrTriagingAgent.java
similarity index 100%
rename from contrib/samples/github/adkprtriaging/AdkPrTriagingAgent.java
rename to contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/AdkPrTriagingAgent.java
diff --git a/contrib/samples/github/adkprtriaging/AdkPrTriagingAgentRun.java b/contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/AdkPrTriagingAgentRun.java
similarity index 100%
rename from contrib/samples/github/adkprtriaging/AdkPrTriagingAgentRun.java
rename to contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/AdkPrTriagingAgentRun.java
diff --git a/contrib/samples/github/adkprtriaging/Settings.java b/contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/Settings.java
similarity index 100%
rename from contrib/samples/github/adkprtriaging/Settings.java
rename to contrib/samples/github/adkprtriaging/src/main/java/com/example/adkprtriaging/Settings.java
diff --git a/contrib/samples/github/adkreleasedocs/pom.xml b/contrib/samples/github/adkreleasedocs/pom.xml
index f81c6c72e..c775c945d 100644
--- a/contrib/samples/github/adkreleasedocs/pom.xml
+++ b/contrib/samples/github/adkreleasedocs/pom.xml
@@ -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>
@@ -48,11 +50,11 @@
             <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>
@@ -60,11 +62,6 @@
             <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>
@@ -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>
diff --git a/contrib/samples/github/adkreleasedocs/AdkDocsReleaseAnalyzerAgent.java b/contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/AdkDocsReleaseAnalyzerAgent.java
similarity index 100%
rename from contrib/samples/github/adkreleasedocs/AdkDocsReleaseAnalyzerAgent.java
rename to contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/AdkDocsReleaseAnalyzerAgent.java
diff --git a/contrib/samples/github/adkreleasedocs/AdkDocsReleaseAnalyzerRun.java b/contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/AdkDocsReleaseAnalyzerRun.java
similarity index 100%
rename from contrib/samples/github/adkreleasedocs/AdkDocsReleaseAnalyzerRun.java
rename to contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/AdkDocsReleaseAnalyzerRun.java
diff --git a/contrib/samples/github/adkreleasedocs/Settings.java b/contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/Settings.java
similarity index 100%
rename from contrib/samples/github/adkreleasedocs/Settings.java
rename to contrib/samples/github/adkreleasedocs/src/main/java/com/example/adkdocs/Settings.java
diff --git a/contrib/samples/github/adkspam/pom.xml b/contrib/samples/github/adkspam/pom.xml
index 5c1a9a6ed..066840879 100644
--- a/contrib/samples/github/adkspam/pom.xml
+++ b/contrib/samples/github/adkspam/pom.xml
@@ -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>
@@ -50,18 +52,13 @@
             <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>
@@ -69,8 +66,7 @@
             <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>
@@ -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>
diff --git a/contrib/samples/github/adkspam/Settings.java b/contrib/samples/github/adkspam/src/main/java/com/example/adkspam/Settings.java
similarity index 100%
rename from contrib/samples/github/adkspam/Settings.java
rename to contrib/samples/github/adkspam/src/main/java/com/example/adkspam/Settings.java
diff --git a/contrib/samples/github/adkspam/SpamDetectionAgent.java b/contrib/samples/github/adkspam/src/main/java/com/example/adkspam/SpamDetectionAgent.java
similarity index 100%
rename from contrib/samples/github/adkspam/SpamDetectionAgent.java
rename to contrib/samples/github/adkspam/src/main/java/com/example/adkspam/SpamDetectionAgent.java
diff --git a/contrib/samples/github/adkspam/SpamDetectionAgentRun.java b/contrib/samples/github/adkspam/src/main/java/com/example/adkspam/SpamDetectionAgentRun.java
similarity index 100%
rename from contrib/samples/github/adkspam/SpamDetectionAgentRun.java
rename to contrib/samples/github/adkspam/src/main/java/com/example/adkspam/SpamDetectionAgentRun.java
diff --git a/contrib/samples/github/adkstale/pom.xml b/contrib/samples/github/adkstale/pom.xml
index f6cdcbe60..b09675be3 100644
--- a/contrib/samples/github/adkstale/pom.xml
+++ b/contrib/samples/github/adkstale/pom.xml
@@ -42,6 +42,8 @@
         <!-- Main class for exec-maven-plugin -->
         <exec.mainClass>com.example.adkstale.AdkStaleAgentRun</exec.mainClass>
         <google-adk.version>${project.version}</google-adk.version>
+        <!-- Helper/sample module: not published to Maven Central. -->
+        <skipPublishing>true</skipPublishing>
     </properties>
 
     <dependencies>
@@ -50,24 +52,18 @@
             <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>
-        <!-- Parses the GraphQL/REST JSON responses fetched via the JDK HttpClient. Version is
-             managed by the parent POM's jackson-bom import. -->
+        <!-- Parses GraphQL/REST JSON; version from the parent jackson-bom. -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </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>
@@ -75,8 +71,7 @@
             <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>
@@ -108,81 +103,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>adkstale/*.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>adkspam/**</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>adkspam/**</sourceFileExclude>
-                        <sourceFileExclude>adktriaging/**</sourceFileExclude>
-                        <sourceFileExclude>**/src/test/**</sourceFileExclude>
-                    </sourceFileExcludes>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/contrib/samples/github/adkstale/AdkStaleAgent.java b/contrib/samples/github/adkstale/src/main/java/com/example/adkstale/AdkStaleAgent.java
similarity index 100%
rename from contrib/samples/github/adkstale/AdkStaleAgent.java
rename to contrib/samples/github/adkstale/src/main/java/com/example/adkstale/AdkStaleAgent.java
diff --git a/contrib/samples/github/adkstale/AdkStaleAgentRun.java b/contrib/samples/github/adkstale/src/main/java/com/example/adkstale/AdkStaleAgentRun.java
similarity index 100%
rename from contrib/samples/github/adkstale/AdkStaleAgentRun.java
rename to contrib/samples/github/adkstale/src/main/java/com/example/adkstale/AdkStaleAgentRun.java
diff --git a/contrib/samples/github/adkstale/GitHubStaleClient.java b/contrib/samples/github/adkstale/src/main/java/com/example/adkstale/GitHubStaleClient.java
similarity index 100%
rename from contrib/samples/github/adkstale/GitHubStaleClient.java
rename to contrib/samples/github/adkstale/src/main/java/com/example/adkstale/GitHubStaleClient.java
diff --git a/contrib/samples/github/adkstale/Settings.java b/contrib/samples/github/adkstale/src/main/java/com/example/adkstale/Settings.java
similarity index 100%
rename from contrib/samples/github/adkstale/Settings.java
rename to contrib/samples/github/adkstale/src/main/java/com/example/adkstale/Settings.java
diff --git a/contrib/samples/github/adktriaging/pom.xml b/contrib/samples/github/adktriaging/pom.xml
index 54af534d5..640170f70 100644
--- a/contrib/samples/github/adktriaging/pom.xml
+++ b/contrib/samples/github/adktriaging/pom.xml
@@ -40,6 +40,8 @@
         <!-- Main class for exec-maven-plugin -->
         <exec.mainClass>com.example.adktriaging.AdkTriagingAgentRun</exec.mainClass>
         <google-adk.version>${project.version}</google-adk.version>
+        <!-- Helper/sample module: not published to Maven Central. -->
+        <skipPublishing>true</skipPublishing>
     </properties>
 
     <dependencies>
@@ -48,18 +50,13 @@
             <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>
@@ -67,8 +64,7 @@
             <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>
@@ -100,81 +96,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>adktriaging/*.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>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>adkprtriaging/**</sourceFileExclude>
-                        <sourceFileExclude>adkreleasedocs/**</sourceFileExclude>
-                        <sourceFileExclude>adkspam/**</sourceFileExclude>
-                        <sourceFileExclude>adkstale/**</sourceFileExclude>
-                        <sourceFileExclude>**/src/test/**</sourceFileExclude>
-                    </sourceFileExcludes>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/contrib/samples/github/adktriaging/AdkTriagingAgent.java b/contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/AdkTriagingAgent.java
similarity index 100%
rename from contrib/samples/github/adktriaging/AdkTriagingAgent.java
rename to contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/AdkTriagingAgent.java
diff --git a/contrib/samples/github/adktriaging/AdkTriagingAgentRun.java b/contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/AdkTriagingAgentRun.java
similarity index 100%
rename from contrib/samples/github/adktriaging/AdkTriagingAgentRun.java
rename to contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/AdkTriagingAgentRun.java
diff --git a/contrib/samples/github/adktriaging/Settings.java b/contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/Settings.java
similarity index 100%
rename from contrib/samples/github/adktriaging/Settings.java
rename to contrib/samples/github/adktriaging/src/main/java/com/example/adktriaging/Settings.java
diff --git a/contrib/samples/github/githubtools/pom.xml b/contrib/samples/github/githubtools/pom.xml
new file mode 100644
index 000000000..240a8f6d3
--- /dev/null
+++ b/contrib/samples/github/githubtools/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2026 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+
+    <parent>
+        <groupId>com.google.adk</groupId>
+        <artifactId>google-adk-samples</artifactId>
+        <version>1.5.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <groupId>com.google.adk.samples</groupId>
+    <artifactId>google-adk-sample-github-tools</artifactId>
+    <name>Google ADK - Sample - Shared GitHub Tools</name>
+    <description>
+        Shared GitHubTools library used by the ADK GitHub agent samples (issue triaging, PR triaging,
+        stale auditor, docs release analyzer). Wraps the org.kohsuke github-api as ADK FunctionTools.
+    </description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>17</java.version>
+        <google-adk.version>${project.version}</google-adk.version>
+        <!-- Helper/sample module: not published to Maven Central. -->
+        <skipPublishing>true</skipPublishing>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.adk</groupId>
+            <artifactId>google-adk</artifactId>
+            <version>${google-adk.version}</version>
+        </dependency>
+        <!-- GitHub REST API client wrapped by GitHubTools. -->
+        <dependency>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>github-api</artifactId>
+            <version>1.330</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <!-- Preserve parameter names for FunctionTool introspection. -->
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/contrib/samples/github/GitHubTools.java b/contrib/samples/github/githubtools/src/main/java/com/example/github/GitHubTools.java
similarity index 100%
rename from contrib/samples/github/GitHubTools.java
rename to contrib/samples/github/githubtools/src/main/java/com/example/github/GitHubTools.java
diff --git a/contrib/samples/pom.xml b/contrib/samples/pom.xml
index 95e424cb1..04ab3ffd5 100644
--- a/contrib/samples/pom.xml
+++ b/contrib/samples/pom.xml
@@ -19,6 +19,7 @@
     <module>a2a_basic</module>
     <module>a2a_server</module>
     <module>configagent</module>
+    <module>github/githubtools</module>
     <module>github/adkprtriaging</module>
     <module>github/adkreleasedocs</module>
     <module>github/adkspam</module>
diff --git a/pom.xml b/pom.xml
index a60b035f1..fe96961c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <plugin>
           <groupId>org.sonatype.central</groupId>
           <artifactId>central-publishing-maven-plugin</artifactId>
-          <version>0.8.0</version>
+          <version>0.9.0</version>
           <extensions>true</extensions>
           <configuration>
             <publishingServerId>central</publishingServerId>
@@ -530,7 +530,7 @@
           <plugin>
             <groupId>org.sonatype.central</groupId>
             <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.8.0</version>
+            <version>0.9.0</version>
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>central</publishingServerId>