diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 0f8d80ee6..4133d67dd 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -36,10 +36,5 @@ jobs: ${{ runner.os }}-maven-${{ matrix.java-version }}- ${{ runner.os }}-maven- - - name: Compile and install core module with Java ${{ matrix.java-version }} - working-directory: ./core - run: ./mvnw clean compile install - - - name: Compile dev module with Java ${{ matrix.java-version }} - working-directory: ./dev - run: ./mvnw clean compile + - name: Compile and test (all) modules with Java ${{ matrix.java-version }} + run: ./mvnw clean test diff --git a/core/pom.xml b/core/pom.xml index 9df247bd9..05fc5d9a7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -14,49 +14,27 @@ See the License for the specific language governing permissions and limitations under the License. --> + + 4.0.0 + + com.google.adk + google-adk-parent + 0.1.1-SNAPSHOT + - - 4.0.0 - com.google.adk google-adk - 0.1.1-SNAPSHOT - jar Agent Development Kit - https://github.com/google/adk-java - - - The Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - scm:git:git@github.com/google:adk-java.git - - scm:git:git@github.com/google:adk-java.git - - git@github.com/google:adk-java.git - - - - Google Inc. - http://www.google.com - - - - Agent Development Kit: an open-source, code-first toolkit designed to simplify building, - evaluating, and deploying advanced AI agents anywhere. - + Agent Development Kit: an open-source, code-first toolkit designed to simplify building, evaluating, and deploying advanced AI agents anywhere. + - UTF-8 - 17 - ${java.version} 0.10.0 2.38.0 1.33.1 2.28.0 1.0.0 - 1.11.0 4.31.0-RC1 5.11.4 5.17.0 @@ -64,36 +42,7 @@ 2.19.0 4.12.0 - - - ossrh - Central Repository OSSRH - https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - Central Repository OSSRH for snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - - - - - com.google.cloud - libraries-bom - 26.53.0 - pom - import - - - io.opentelemetry - opentelemetry-bom - 1.49.0 - pom - import - - - + com.anthropic @@ -159,9 +108,9 @@ ${jackson.version} - com.google.protobuf - protobuf-javalite - ${protobuf.version} + com.google.protobuf + protobuf-javalite + ${protobuf.version} org.java-websocket @@ -227,222 +176,24 @@ test - io.opentelemetry - opentelemetry-api + io.opentelemetry + opentelemetry-api - io.opentelemetry - opentelemetry-sdk + io.opentelemetry + opentelemetry-sdk - io.opentelemetry - opentelemetry-exporter-otlp + io.opentelemetry + opentelemetry-exporter-otlp - io.opentelemetry - opentelemetry-sdk-logs + io.opentelemetry + opentelemetry-sdk-logs - io.opentelemetry - opentelemetry-sdk-trace + io.opentelemetry + opentelemetry-sdk-trace - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.0 - - - - - - maven-clean-plugin - 3.1.0 - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.13.0 - - ${java.version} - ${java.version} - ${maven.compiler.release} - true - - - com.google.auto.value - auto-value - ${auto-value.version} - - - - - - maven-surefire-plugin - 3.5.2 - - - me.fabriciorby - maven-surefire-junit5-tree-reporter - 0.1.0 - - - - plain - - - **/*Test.java - - - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 3.1.1 - - false - - - - maven-site-plugin - 3.7.1 - - - maven-project-info-reports-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - all,-missing - true - ${project.build.directory}/javadoc - Agent Development Kit - ${maven.compiler.release} - UTF-8 - - - - attach-javadocs - - jar - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://google.oss.sonatype.org/ - false - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.12 - - - - prepare-agent - - - - *MockitoMock* - *$$EnhancerByMockitoWithCGLIB$$* - *$$FastClassByMockitoWithCGLIB$$* - com/sun/tools/attach/* - sun/util/resources/cldr/provider/* - - - - - report - test - - report - - - - HTML - - - - - - - - - - release - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - diff --git a/dev/pom.xml b/dev/pom.xml index ac534824e..a066d8907 100644 --- a/dev/pom.xml +++ b/dev/pom.xml @@ -13,279 +13,124 @@ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 + 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"> + 4.0.0 + + com.google.adk - google-adk-dev - 0.1.1-SNAPSHOT - jar - Agent Development Kit - Dev Tools - https://github.com/google/adk-java - - Development tools and server for Agent Development Kit. - - - - The Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - scm:git:git@github.com/google:adk-java.git - - scm:git:git@github.com/google:adk-java.git - - git@github.com/google:adk-java.git - - - - Google Inc. - http://www.google.com - - - - UTF-8 - 17 - ${java.version} - 3.4.1 - 0.18.1 - 3.41.0 - 1.49.0 - - - - ossrh - Central Repository OSSRH - https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - Central Repository OSSRH for snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - - - - - io.opentelemetry - opentelemetry-bom - ${otel.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - + google-adk-parent + 0.1.1-SNAPSHOT + + + google-adk-dev + Agent Development Kit - Dev Tools + Development tools and server for Agent Development Kit. + + + 0.18.1 + 3.41.0 + + - - com.google.adk - google-adk - 0.1.0 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - guru.nidi - graphviz-java - ${graphviz.version} - - - org.eclipse.jdt - ecj - ${ecj.version} - - - io.opentelemetry - opentelemetry-sdk-common - - - io.opentelemetry - opentelemetry-api - - - io.opentelemetry - opentelemetry-sdk - - - io.opentelemetry - opentelemetry-exporter-otlp - - - io.opentelemetry - opentelemetry-sdk-logs - - - io.opentelemetry - opentelemetry-sdk-trace - + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.0 - - - - - browser - - browser - - - - - - maven-compiler-plugin - 3.13.0 - - ${java.version} - ${java.version} - ${maven.compiler.release} - true - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - repackage - - repackage - - - exec - - - - - - maven-deploy-plugin - 3.1.1 - - false - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - all,-missing - true - ${project.build.directory}/javadoc - Agent Development Kit - Dev Tools - ${maven.compiler.release} - UTF-8 - - - - attach-javadocs - - jar - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://google.oss.sonatype.org/ - false - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - maven-deploy-plugin - 3.1.1 - - false - - - - - - - release - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - + + + + com.google.adk + google-adk + 0.1.1-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + guru.nidi + graphviz-java + ${graphviz.version} + + + org.eclipse.jdt + ecj + ${ecj.version} + + + io.opentelemetry + opentelemetry-sdk-common + + + io.opentelemetry + opentelemetry-api + + + io.opentelemetry + opentelemetry-sdk + + + io.opentelemetry + opentelemetry-exporter-otlp + + + io.opentelemetry + opentelemetry-sdk-logs + + + io.opentelemetry + opentelemetry-sdk-trace + + + + + + browser + + browser + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + repackage + + repackage + + + exec + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..92bced1c7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,291 @@ + + + + 4.0.0 + + com.google.adk + google-adk-parent + 0.1.1-SNAPSHOT + pom + + Google Agent Development Kit Maven Parent POM + https://github.com/google/adk-java + + + core + dev + + + + 17 + ${java.version} + UTF-8 + + 1.11.0 + 3.4.1 + 1.49.0 + + + + + + com.google.cloud + libraries-bom + 26.53.0 + pom + import + + + io.opentelemetry + opentelemetry-bom + ${otel.version} + pom + import + + + + + + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.0 + + + + + + maven-clean-plugin + 3.1.0 + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.13.0 + + ${java.version} + ${java.version} + ${maven.compiler.release} + true + + + com.google.auto.value + auto-value + ${auto-value.version} + + + + + + maven-surefire-plugin + 3.5.2 + + + me.fabriciorby + maven-surefire-junit5-tree-reporter + 0.1.0 + + + + plain + + + **/*Test.java + + + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 3.1.1 + + false + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + all,-missing + true + ${project.build.directory}/javadoc + Agent Development Kit + ${maven.compiler.release} + UTF-8 + + + + attach-javadocs + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + ossrh + https://google.oss.sonatype.org/ + false + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + + prepare-agent + + + + *MockitoMock* + *$$EnhancerByMockitoWithCGLIB$$* + *$$FastClassByMockitoWithCGLIB$$* + com/sun/tools/attach/* + sun/util/resources/cldr/provider/* + + + + + report + test + + report + + + + HTML + + + + + + + + + + release + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + + + The Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + scm:git:git@github.com/google:adk-java.git + scm:git:git@github.com/google:adk-java.git + git@github.com/google:adk-java.git + + + + Google Inc. + http://www.google.com + + + + + ossrh + Central Repository OSSRH + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + Central Repository OSSRH for snapshots + https://google.oss.sonatype.org/content/repositories/snapshots + + +