Merge pull request #53 from oracle/okafka-23.4.0.0

Author: pasimoes

.gitignore

@@ -18,3 +18,20 @@ bin/
 
 doc/
 /.metadata/
+
+.classpath
+.project
+.settings/
+clients/.classpath
+clients/.project
+clients/.settings/
+examples/.project
+examples/.settings/
+examples/ojdbc.properties
+examples/consumer/.classpath
+examples/consumer/.project
+examples/consumer/.settings/
+examples/producer/.classpath
+examples/producer/.project
+examples/producer/.settings/
+okafka-github/

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+Copyright (c) 2019, 2024 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 
@@ -873,4 +873,4 @@ GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
 PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED 
 BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH 
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-_______________________
+_______________________

README.md

@@ -1,7 +1,7 @@
 /*
-** OKafka Java Client version 0.8.
+** OKafka Java Client version 23.4.
 **
-** Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+** Copyright (c) 2019, 2024 Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 
@@ -18,21 +18,22 @@ allprojects {
     }
 
     group = 'org.oracle.okafka'
-    version = '0.8'
+    version = '23.4.0.0'
 
     tasks.withType(Javadoc) {
         // disable the crazy super-strict doclint tool in Java 8
         // noinspection SpellCheckingInspection
+        title ="Oracle Kafka 23.4.0.0 API"
         options.addStringOption('Xdoclint:none', '-quiet')
         options.windowTitle = "Oracle Database Transactional Event Queues Java API Reference"
-        options.header = """<b>Oracle&reg; Database Transactional Event Queues Java API Reference<br>20c</b><br>F30355-02<br>"""
-        options.bottom = """<center><small>Copyright &copy; 2001, 2020, Oracle and/or its affiliates. All rights reserved.<small></center><p><small><br></small></p>"""
+        options.header = """<b>Oracle&reg; Database Transactional Event Queues Java API Reference<br>23ai</b><br>FF46992-04<br>"""
+        options.bottom = """<center><small>Copyright &copy; 2001, 2024, Oracle and/or its affiliates. All rights reserved.<small></center><p><small><br></small></p>"""
     }
 }
 
 ext {
-    gradleVersion = '7.3'
-    minJavaVersion = JavaVersion.VERSION_1_8
+    gradleVersion = '8.8'
+    minJavaVersion = JavaVersion.VERSION_17
 
     mavenUrl = project.hasProperty('mavenUrl') ? project.mavenUrl : ''
     mavenUsername = project.hasProperty('mavenUsername') ? project.mavenUsername : ''
@@ -45,50 +46,61 @@ project(':clients') {
     sourceCompatibility = minJavaVersion
     targetCompatibility = minJavaVersion
 
-    println 'project okafka client lib'
+    sourceSets {
+        main {
+            java {
+                srcDir 'src/main/java'
+                exclude 'tests/**'
+                exclude 'test/**'
+            }
+        }
+    }
+
+    println 'Building okafka 23.4.0.0 Java API jar'
 
     dependencies {
-        // Test dependencies
-        testImplementation group: 'org.easymock', name: 'easymock', version: '4.3'
-        testImplementation group: 'org.powermock', name: 'powermock-api-support', version: '2.0.9'
-        testImplementation group: 'org.powermock', name: 'powermock-api-easymock', version: '2.0.9'
-        testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.9'
-        testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36'
 
         // These dependencies are used by the application.
-        implementation group: 'com.oracle.database.jdbc', name: 'ojdbc11', version: '21.5.0.0'
-        implementation group: 'com.oracle.database.messaging', name: 'aqapi', version: '19.3.0.0'
-        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '21.5.0.0'
-        implementation group: 'com.oracle.database.security', name: 'osdt_core', version: '21.5.0.0'
-        implementation group: 'com.oracle.database.security', name: 'osdt_cert', version: '21.5.0.0'
-        implementation group: 'javax.jms', name: 'javax.jms-api', version: '2.0.1'
+        implementation group: 'com.oracle.database.jdbc', name: 'ojdbc11', version: '23.4.0.24.05'
+        implementation group: 'com.oracle.database.messaging', name: 'aqapi', version: '23.3.0.0'
         implementation group: 'javax.transaction', name: 'jta', version: '1.1'
-        implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-        implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36'
+        implementation group: 'javax.jms', name: 'javax.jms-api', version: '2.0'
+        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '23.4.0.24.05'
+        implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha0'
+        implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.7.1'
+        // Use JUnit test framework
+        implementation group: 'junit', name: 'junit', version: '4.12'
+
+        // Test dependencies
+        testImplementation group: 'org.easymock', name: 'easymock', version: '3.6'
+        testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.0-beta.5'
+        testImplementation group: 'org.powermock', name: 'powermock-api-support', version: '2.0.5'
+        testImplementation group: 'org.powermock', name: 'powermock-api-easymock', version: '2.0.0-beta.5'
+
     }
 
     javadoc {
-        include "**/org/oracle/okafka/clients/admin/*"
-        include "**/org/oracle/okafka/clients/consumer/*"
-        include "**/org/oracle/okafka/clients/producer/*"
-        include "**/org/oracle/okafka/common/*"
-        include "**/org/oracle/okafka/common/annotation/*"
-        include "**/org/oracle/okafka/common/errors/*"
-        include "**/org/oracle/okafka/common/resource/*"
-        include "**/org/oracle/okafka/common/serialization/*"
-        include "**/org/oracle/okafka/common/config/*"
+        include "org/oracle/okafka/clients/admin/*"
+        include "org/oracle/okafka/clients/consumer/*"
+        include "org/oracle/okafka/clients/producer/*"
+        include "org/oracle/okafka/common/errors/*"
     }
 
     tasks.named('jar') {
-        description('Generates okafka client jar ')
+        description('Generates okafka 23.4.0.0 API jar ')
         archiveBaseName = 'okafka'
+        archiveVersion = '23.4.0.0'
 
         from "${rootProject.projectDir}/LICENSE.txt"
         from "${rootProject.projectDir}/NOTICE"
 
         manifest {
-            attributes( 'Implementation-Title'  : 'okafka',
-                        'Implementation-Version': project.version)
+            attributes (
+                    'Implementation-Title'  : 'okafka',
+                    'Implementation-Version': project.version,
+                    'Version': '23.4.0.0',
+                    'Build-Time-ISO-8601':new Date().format("yyyy-MM-dd HH:mm:ss")
+            )
         }
     }
 
@@ -98,7 +110,7 @@ project(':clients') {
 
         manifest {
             attributes( 'Implementation-Title'  : 'okafka',
-                        'Implementation-Version': project.version)
+                    'Implementation-Version': project.version)
         }
 
         from "${rootProject.projectDir}/LICENSE.txt"
@@ -115,6 +127,7 @@ project(':clients') {
     }
 }
 
+
 project(':examples:consumer') {
     apply plugin : 'java'
     apply plugin : 'application'
@@ -125,7 +138,9 @@ project(':examples:consumer') {
     dependencies {
         // These dependencies are used by the application.
         implementation project(':clients')
-        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '21.5.0.0'
+        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '23.4.0.24.05'
+        implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.7.1'
+        implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.6'
     }
 
 
@@ -139,14 +154,14 @@ project(':examples:consumer') {
 
         manifest {
             attributes( 'Implementation-Title'  : 'okafka consumer',
-                        'Implementation-Version': project.version)
+                    'Implementation-Version': project.version)
         }
     }
 
     tasks.named('run') {
-        description('Run okafka client consumer')
+        description('Run okafka client simple consumer')
         application {
-            mainClass = 'org.oracle.okafka.examples.Consumer'
+            mainClass = 'org.oracle.okafka.examples.ConsumerOKafka'
         }
     }
 }
@@ -161,11 +176,13 @@ project(':examples:producer') {
     dependencies {
         // These dependencies are used by the application.
         implementation project(':clients')
-        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '21.5.0.0'
+        implementation group: 'com.oracle.database.security', name: 'oraclepki', version: '23.4.0.24.05'
+        implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.7.1'
+        implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.6'
     }
 
     tasks.named('jar') {
-        description('Generates okafka client producer jar ')
+        description('Generates okafka client simple producer jar ')
         archiveBaseName = 'okafka'
         archiveClassifier = 'producer'
 
@@ -174,14 +191,14 @@ project(':examples:producer') {
 
         manifest {
             attributes( 'Implementation-Title'  : 'okafka producer',
-                        'Implementation-Version': project.version)
+                    'Implementation-Version': project.version)
         }
     }
 
     tasks.named('run') {
-        description('Run okafka client producer')
+        description('Run okafka client simple producer')
         application {
-            mainClass = 'org.oracle.okafka.examples.Producer'
+            mainClass = 'org.oracle.okafka.examples.ProducerOKafka'
         }
     }
 }

build.gradle

@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.oracle.database.messaging</groupId>
   <artifactId>okafka</artifactId>
-  <version>0.8</version>
+  <version>23.4.0.0</version>
 
    <!-- Start of fields requiring product specific values -->
   <name>okafka</name>
   <description>Oracle's implementation of Kafka Java Client for Oracle Transactional Event Queues</description>
-  <url>https://docs.oracle.com/en/database/oracle/oracle-database/21/okjdc/index.html</url>
+  <url>https://docs.oracle.com/en/database/oracle/oracle-database/23/okjdc/index.html</url>
   <!-- End of fields requiring product specific values -->
 
   <licenses>
@@ -38,8 +38,8 @@
     <java.version>11</java.version>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
-    <oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
-    <oracle-db-messaging.version>19.3.0.0</oracle-db-messaging.version>
+    <oracle-jdbc.version>23.4.0.24.05</oracle-jdbc.version>
+    <oracle-db-messaging.version>23.3.0.0</oracle-db-messaging.version>
     <jms.version>2.0.1</jms.version>
     <javax-transaction.version>1.3</javax-transaction.version>
   </properties>
@@ -60,16 +60,6 @@
       <artifactId>oraclepki</artifactId>
       <version>${oracle-jdbc.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.oracle.database.security</groupId>
-      <artifactId>osdt_core</artifactId>
-      <version>${oracle-jdbc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle.database.security</groupId>
-      <artifactId>osdt_cert</artifactId>
-      <version>${oracle-jdbc.version}</version>
-    </dependency>
     <dependency>
       <groupId>javax.jms</groupId>
       <artifactId>javax.jms-api</artifactId>
@@ -90,5 +80,11 @@
       <artifactId>aqapi</artifactId>
       <version>${oracle-db-messaging.version}</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients -->
+	<dependency>
+   	 <groupId>org.apache.kafka</groupId>
+   	 <artifactId>kafka-clients</artifactId>
+   	 <version>3.7.1</version>
+	</dependency>
   </dependencies>
 </project>

clients/okafka-0.8.pom renamed to clients/okafka.pom

@@ -4,7 +4,7 @@
 
     <groupId>com.oracle.database.messaging</groupId>
     <artifactId>okafka</artifactId>
-    <version>0.8</version>
+    <version>23.4.0.0</version>
 
     <packaging>jar</packaging>
 
@@ -32,8 +32,8 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <java.version>11</java.version>
         <logback.version>1.3.12</logback.version>
-        <oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
-        <oracle-db-messaging.version>19.3.0.0</oracle-db-messaging.version>
+        <oracle-jdbc.version>23.4.0.24.05</oracle-jdbc.version>
+        <oracle-db-messaging.version>23.3.0.0</oracle-db-messaging.version>
         <jms.version>2.0.1</jms.version>
         <javax-transaction.version>1.3</javax-transaction.version>
     </properties>
@@ -61,16 +61,6 @@
             <artifactId>oraclepki</artifactId>
             <version>${oracle-jdbc.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.oracle.database.security</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>${oracle-jdbc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.database.security</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>${oracle-jdbc.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.jms</groupId>
             <artifactId>javax.jms-api</artifactId>
@@ -91,6 +81,11 @@
             <artifactId>aqapi</artifactId>
             <version>${oracle-db-messaging.version}</version>
         </dependency>
+        <dependency>
+   			 <groupId>org.apache.kafka</groupId>
+   			 <artifactId>kafka-clients</artifactId>
+   			 <version>3.7.1</version>
+		</dependency>
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>