Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions .github/workflows/run-all-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,26 @@ jobs:
cache: maven
- name: Build and test
run: mvn clean verify --batch-mode --no-transfer-progress
- name: Verify no vendor SDK in compile scope
- name: Verify release artifacts include OpenAI adapter
run: |
set -euo pipefail
core_jar="$(find oci-genai-auth-java-core/target -maxdepth 1 -name 'oci-genai-auth-java-core-*.jar' ! -name '*-sources.jar' ! -name '*-javadoc.jar' | head -n 1)"
sources_jar="$(find oci-genai-auth-java-core/target -maxdepth 1 -name 'oci-genai-auth-java-core-*-sources.jar' | head -n 1)"
javadoc_jar="$(find oci-genai-auth-java-core/target -maxdepth 1 -name 'oci-genai-auth-java-core-*-javadoc.jar' | head -n 1)"

test -n "$core_jar"
test -n "$sources_jar"
test -n "$javadoc_jar"

jar tf "$core_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.class'
jar tf "$sources_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.java'
jar tf "$javadoc_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.html'
for artifact in "$core_jar" "$sources_jar" "$javadoc_jar"; do
jar tf "$artifact" | grep -q '^LICENSE.txt$'
jar tf "$artifact" | grep -q '^THIRD_PARTY_LICENSES.txt$'
done
- name: Verify no non-optional vendor SDK in compile scope
run: |
mvn dependency:tree -pl oci-genai-auth-java-core --batch-mode --no-transfer-progress | \
grep -v "test" | grep -v "INFO" | grep -v "WARNING" | \
grep -v "test" | grep -v "INFO" | grep -v "WARNING" | grep -v "(optional)" | \
(! grep -E "anthropic|openai|google-cloud")
2 changes: 1 addition & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Replace the old dependency with the new one in your `pom.xml`:
<dependency>
<groupId>com.oracle.genai</groupId>
<artifactId>oci-genai-auth-java-bom</artifactId>
<version>1.0.4</version>
<version>1.0.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Requires **Java 17+** and **Maven 3.8+**.
<dependency>
<groupId>com.oracle.genai</groupId>
<artifactId>oci-genai-auth-java-bom</artifactId>
<version>1.0.4</version>
<version>1.0.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
7 changes: 7 additions & 0 deletions THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ dependencies (JUnit, Mockito, MockWebServer, etc.) are not redistributed.
License: MIT License
URL: https://www.slf4j.org

5. OpenAI Java Core
Group: com.openai
Artifact: openai-java-core
Version: 4.39.1
License: Apache License 2.0
URL: https://github.com/openai/openai-java

================================================================================

APACHE LICENSE 2.0
Expand Down
4 changes: 2 additions & 2 deletions oci-genai-auth-java-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.oracle.genai</groupId>
<artifactId>oci-genai-auth-java-bom</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<packaging>pom</packaging>

<name>OCI GenAI Auth :: BOM</name>
Expand All @@ -23,7 +23,7 @@
</description>

<properties>
<oci-genai-auth.version>1.0.8</oci-genai-auth.version>
<oci-genai-auth.version>1.0.9</oci-genai-auth.version>

<!-- OCI SDK -->
<oci-sdk.version>3.72.1</oci-sdk.version>
Expand Down
72 changes: 69 additions & 3 deletions oci-genai-auth-java-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.oracle.genai</groupId>
<artifactId>oci-genai-auth-java-parent</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
</parent>

<artifactId>oci-genai-auth-java-core</artifactId>
Expand Down Expand Up @@ -55,16 +55,82 @@
<dependency>
<groupId>com.openai</groupId>
<artifactId>openai-java-core</artifactId>
<version>4.26.0</version>
<version>${openai-java.version}</version>
<optional>true</optional>
</dependency>

<!-- OpenAI SDK — integration tests only -->
<dependency>
<groupId>com.openai</groupId>
<artifactId>openai-java</artifactId>
<version>4.26.0</version>
<version>${openai-java.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>add-legal-files-to-release-jars</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<zip destfile="${project.build.directory}/${project.build.finalName}.jar" update="true">
<fileset dir="${project.basedir}/..">
<include name="LICENSE.txt"/>
<include name="THIRD_PARTY_LICENSES.txt"/>
</fileset>
</zip>
<zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar" update="true">
<fileset dir="${project.basedir}/..">
<include name="LICENSE.txt"/>
<include name="THIRD_PARTY_LICENSES.txt"/>
</fileset>
</zip>
<zip destfile="${project.build.directory}/${project.build.finalName}-javadoc.jar" update="true">
<fileset dir="${project.basedir}/..">
<include name="LICENSE.txt"/>
<include name="THIRD_PARTY_LICENSES.txt"/>
</fileset>
</zip>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
26 changes: 24 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.oracle.genai</groupId>
<artifactId>oci-genai-auth-java-parent</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<packaging>pom</packaging>

<name>OCI GenAI Auth :: Parent</name>
Expand All @@ -39,14 +39,15 @@
<maven.compiler.target>17</maven.compiler.target>

<!-- First-party versions -->
<oci-genai-auth.version>1.0.8</oci-genai-auth.version>
<oci-genai-auth.version>1.0.9</oci-genai-auth.version>

<!-- OCI SDK -->
<oci-sdk.version>3.72.1</oci-sdk.version>

<!-- Shared dependencies -->
<okhttp.version>5.3.2</okhttp.version>
<slf4j.version>2.0.17</slf4j.version>
<openai-java.version>4.39.1</openai-java.version>

<!-- Test dependencies -->
<junit-jupiter.version>5.11.4</junit-jupiter.version>
Expand All @@ -57,6 +58,9 @@
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -134,6 +138,24 @@
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
Loading