Skip to content

Commit 1981fe7

Browse files
OpheliaLjhOpheliaLjh
authored
Merge pull request #13 from oracle-samples/codex/release-1.0.9
Release 1.0.9 with OpenAI adapter artifacts
2 parents 3ca6076 + e52da72 commit 1981fe7

7 files changed

Lines changed: 124 additions & 11 deletions

File tree

‎.github/workflows/run-all-check.yaml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,26 @@ jobs:
2626
cache: maven
2727
- name: Build and test
2828
run: mvn clean verify --batch-mode --no-transfer-progress
29-
- name: Verify no vendor SDK in compile scope
29+
- name: Verify release artifacts include OpenAI adapter
30+
run: |
31+
set -euo pipefail
32+
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)"
33+
sources_jar="$(find oci-genai-auth-java-core/target -maxdepth 1 -name 'oci-genai-auth-java-core-*-sources.jar' | head -n 1)"
34+
javadoc_jar="$(find oci-genai-auth-java-core/target -maxdepth 1 -name 'oci-genai-auth-java-core-*-javadoc.jar' | head -n 1)"
35+
36+
test -n "$core_jar"
37+
test -n "$sources_jar"
38+
test -n "$javadoc_jar"
39+
40+
jar tf "$core_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.class'
41+
jar tf "$sources_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.java'
42+
jar tf "$javadoc_jar" | grep -q 'com/oracle/genai/auth/OciOpenAIHttpClient.html'
43+
for artifact in "$core_jar" "$sources_jar" "$javadoc_jar"; do
44+
jar tf "$artifact" | grep -q '^LICENSE.txt$'
45+
jar tf "$artifact" | grep -q '^THIRD_PARTY_LICENSES.txt$'
46+
done
47+
- name: Verify no non-optional vendor SDK in compile scope
3048
run: |
3149
mvn dependency:tree -pl oci-genai-auth-java-core --batch-mode --no-transfer-progress | \
32-
grep -v "test" | grep -v "INFO" | grep -v "WARNING" | \
50+
grep -v "test" | grep -v "INFO" | grep -v "WARNING" | grep -v "(optional)" | \
3351
(! grep -E "anthropic|openai|google-cloud")

‎MIGRATION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Replace the old dependency with the new one in your `pom.xml`:
2323
<dependency>
2424
<groupId>com.oracle.genai</groupId>
2525
<artifactId>oci-genai-auth-java-bom</artifactId>
26-
<version>1.0.4</version>
26+
<version>1.0.9</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Requires **Java 17+** and **Maven 3.8+**.
2525
<dependency>
2626
<groupId>com.oracle.genai</groupId>
2727
<artifactId>oci-genai-auth-java-bom</artifactId>
28-
<version>1.0.4</version>
28+
<version>1.0.9</version>
2929
<type>pom</type>
3030
<scope>import</scope>
3131
</dependency>

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ dependencies (JUnit, Mockito, MockWebServer, etc.) are not redistributed.
3434
License: MIT License
3535
URL: https://www.slf4j.org
3636

37+
5. OpenAI Java Core
38+
Group: com.openai
39+
Artifact: openai-java-core
40+
Version: 4.39.1
41+
License: Apache License 2.0
42+
URL: https://github.com/openai/openai-java
43+
3744
================================================================================
3845

3946
APACHE LICENSE 2.0

‎oci-genai-auth-java-bom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.oracle.genai</groupId>
1414
<artifactId>oci-genai-auth-java-bom</artifactId>
15-
<version>1.0.8</version>
15+
<version>1.0.9</version>
1616
<packaging>pom</packaging>
1717

1818
<name>OCI GenAI Auth :: BOM</name>
@@ -23,7 +23,7 @@
2323
</description>
2424

2525
<properties>
26-
<oci-genai-auth.version>1.0.8</oci-genai-auth.version>
26+
<oci-genai-auth.version>1.0.9</oci-genai-auth.version>
2727

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

‎oci-genai-auth-java-core/pom.xml‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>com.oracle.genai</groupId>
1515
<artifactId>oci-genai-auth-java-parent</artifactId>
16-
<version>1.0.8</version>
16+
<version>1.0.9</version>
1717
</parent>
1818

1919
<artifactId>oci-genai-auth-java-core</artifactId>
@@ -55,16 +55,82 @@
5555
<dependency>
5656
<groupId>com.openai</groupId>
5757
<artifactId>openai-java-core</artifactId>
58-
<version>4.26.0</version>
58+
<version>${openai-java.version}</version>
5959
<optional>true</optional>
6060
</dependency>
6161

6262
<!-- OpenAI SDK — integration tests only -->
6363
<dependency>
6464
<groupId>com.openai</groupId>
6565
<artifactId>openai-java</artifactId>
66-
<version>4.26.0</version>
66+
<version>${openai-java.version}</version>
6767
<scope>test</scope>
6868
</dependency>
6969
</dependencies>
70+
71+
<build>
72+
<plugins>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-source-plugin</artifactId>
76+
<executions>
77+
<execution>
78+
<id>attach-sources</id>
79+
<phase>package</phase>
80+
<goals>
81+
<goal>jar-no-fork</goal>
82+
</goals>
83+
</execution>
84+
</executions>
85+
</plugin>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-javadoc-plugin</artifactId>
89+
<executions>
90+
<execution>
91+
<id>attach-javadocs</id>
92+
<phase>package</phase>
93+
<goals>
94+
<goal>jar</goal>
95+
</goals>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-antrun-plugin</artifactId>
102+
<executions>
103+
<execution>
104+
<id>add-legal-files-to-release-jars</id>
105+
<phase>package</phase>
106+
<goals>
107+
<goal>run</goal>
108+
</goals>
109+
<configuration>
110+
<target>
111+
<zip destfile="${project.build.directory}/${project.build.finalName}.jar" update="true">
112+
<fileset dir="${project.basedir}/..">
113+
<include name="LICENSE.txt"/>
114+
<include name="THIRD_PARTY_LICENSES.txt"/>
115+
</fileset>
116+
</zip>
117+
<zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar" update="true">
118+
<fileset dir="${project.basedir}/..">
119+
<include name="LICENSE.txt"/>
120+
<include name="THIRD_PARTY_LICENSES.txt"/>
121+
</fileset>
122+
</zip>
123+
<zip destfile="${project.build.directory}/${project.build.finalName}-javadoc.jar" update="true">
124+
<fileset dir="${project.basedir}/..">
125+
<include name="LICENSE.txt"/>
126+
<include name="THIRD_PARTY_LICENSES.txt"/>
127+
</fileset>
128+
</zip>
129+
</target>
130+
</configuration>
131+
</execution>
132+
</executions>
133+
</plugin>
134+
</plugins>
135+
</build>
70136
</project>

‎pom.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.oracle.genai</groupId>
1414
<artifactId>oci-genai-auth-java-parent</artifactId>
15-
<version>1.0.8</version>
15+
<version>1.0.9</version>
1616
<packaging>pom</packaging>
1717

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

4141
<!-- First-party versions -->
42-
<oci-genai-auth.version>1.0.8</oci-genai-auth.version>
42+
<oci-genai-auth.version>1.0.9</oci-genai-auth.version>
4343

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

4747
<!-- Shared dependencies -->
4848
<okhttp.version>5.3.2</okhttp.version>
4949
<slf4j.version>2.0.17</slf4j.version>
50+
<openai-java.version>4.39.1</openai-java.version>
5051

5152
<!-- Test dependencies -->
5253
<junit-jupiter.version>5.11.4</junit-jupiter.version>
@@ -57,6 +58,9 @@
5758
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
5859
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
5960
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
61+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
62+
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
63+
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
6064
</properties>
6165

6266
<dependencyManagement>
@@ -134,6 +138,24 @@
134138
<artifactId>maven-resources-plugin</artifactId>
135139
<version>${maven-resources-plugin.version}</version>
136140
</plugin>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-source-plugin</artifactId>
144+
<version>${maven-source-plugin.version}</version>
145+
</plugin>
146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-javadoc-plugin</artifactId>
149+
<version>${maven-javadoc-plugin.version}</version>
150+
<configuration>
151+
<doclint>none</doclint>
152+
</configuration>
153+
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-antrun-plugin</artifactId>
157+
<version>${maven-antrun-plugin.version}</version>
158+
</plugin>
137159
</plugins>
138160
</pluginManagement>
139161
<plugins>

0 commit comments

Comments
 (0)