Skip to content

Commit 2ef16fc

Browse files
pasimoespasimoes
authored
WMS-8022 : Bugfix for issue 353 (#356)
* Fix Issue 353::Item 2 - missing okafka library dependencies * Fix Issue 353::Item 3 - remove default from terraform_atp/oci_bucket.tf * Fix Issue 353::Item 1 - missing okafka library (jar) * Fix Issue 353::Item - add okafka in local mvn repo. * Fix Issue 353::Item 2 okafka failed to install local maven local repo * Fix Issue 353::Item 2 okafka failed to install local maven local repo
1 parent a3be8c9 commit 2ef16fc

File tree

11 files changed

+146
-84
lines changed

11 files changed

+146
-84
lines changed

‎workshops/oracleteq-kafka/cloud-setup/database/oracle_db_setup.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Fail on error
6-
set -e
6+
set -eu
77

88
# Wait for Lab DB OCID
99
while ! state_done LAB_DB_OCID; do
@@ -47,6 +47,11 @@ while ! state_done WALLET_GET; do
4747
state_set_done WALLET_GET
4848
done
4949

50+
# Create Object Store Bucket
51+
while ! state_done OBJECT_STORE_BUCKET; do
52+
oci os bucket create --compartment-id "$(state_get COMPARTMENT_OCID)" --name "$(state_get RUN_NAME)"
53+
state_set_done OBJECT_STORE_BUCKET
54+
done
5055

5156
# Get DB Connection Wallet and to Object Store
5257
while ! state_done CWALLET_SSO_OBJECT; do

‎workshops/oracleteq-kafka/cloud-setup/java/graalvm-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Fail on error
6-
set -e
6+
set -eu
77

88
GRAALVM_VERSION=${1:-"22.0.0.2"}
99
OS_NAME=$(uname)

‎workshops/oracleteq-kafka/cloud-setup/okafka/okafka-0.8.lib‎

637 KB
Binary file not shown.

‎workshops/oracleteq-kafka/cloud-setup/okafka/okafka-maven-install.sh‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,36 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Fail on error
6-
set -e
6+
set -eu
7+
8+
# Give GRAALVM_INSTALLED priority
9+
while ! state_done GRAALVM_INSTALLED; do
10+
echo "Waiting for GRAALVM_INSTALLED"
11+
sleep 5
12+
done
13+
14+
# Check JAVA_HOME
15+
pattern='*graalvm-ce-java11-22.0.0.2'
16+
17+
if [[ -z "${JAVA_HOME}" ]] || [[ "${JAVA_HOME}" != $pattern ]]
18+
then
19+
JAVA_HOME="$HOME"/graalvm-ce-java11-22.0.0.2
20+
if [ ! -e "$JAVA_HOME" ]
21+
then
22+
echo "ERROR: This script requires JAVA_HOME to be set to GraalVM"
23+
exit
24+
fi
25+
export JAVA_HOME=$JAVA_HOME
26+
fi
727

828
# PATH to OKafka Library
9-
OKAFKA_LIB="$LAB_HOME"/cloud-setup/okafka/okafka-0.8.jar
29+
OKAFKA_LIB="$LAB_HOME"/cloud-setup/okafka/okafka-0.8.lib
30+
OKAFKA_JAR="$LAB_HOME"/cloud-setup/okafka/okafka-0.8.jar
31+
32+
# rename Lib to Jar
33+
mv "$OKAFKA_LIB" "$OKAFKA_JAR"
1034

1135
# Install okafka library into Maven local repository.
12-
mvn install:install-file -Dfile="$OKAFKA_LIB" -DgroupId=org.oracle.okafka -DartifactId=okafka -Dversion=0.8 -Dpackaging=jar
36+
mvn install:install-file -Dfile="$OKAFKA_JAR" -DgroupId=org.oracle.okafka -DartifactId=okafka -Dversion=0.8 -Dpackaging=jar
1337

1438
state_set_done OKAFKA_INSTALLED

‎workshops/oracleteq-kafka/cloud-setup/terraform_atp/oci_atp_datasources.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,3 @@ data "oci_database_autonomous_databases" "autonomous_databases_atp" {
1515
db_workload = var.autonomous_database_db_workload
1616
}
1717

18-
//======= Name space details ------------------------------------------------------
19-
data "oci_objectstorage_namespace" "lab8022_objstore_namespace" {
20-
#Optional
21-
compartment_id = var.compartment_ocid
22-
}

‎workshops/oracleteq-kafka/cloud-setup/terraform_atp/oci_atp_outputs.tf‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎workshops/oracleteq-kafka/cloud-setup/terraform_atp/oci_bucket.tf‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎workshops/oracleteq-kafka/cloud-setup/utils/terraform.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Fail on error
6-
set -e
6+
set -eu
77

88
# Provision Cluster, DBs, etc with terraform (and wait)
99
if ! state_done PROVISIONING; then
@@ -47,7 +47,7 @@ provider_installation {
4747
fi
4848

4949
cd "$LAB_HOME"
50-
state_set_done OBJECT_STORE_BUCKET
50+
#state_set_done OBJECT_STORE_BUCKET
5151
state_set_done PROVISIONING
5252

5353
fi

‎workshops/oracleteq-kafka/springboot-oracleteq/okafka-consumer/pom.xml‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<groupId>org.oracle.okafka</groupId>
3232
<artifactId>okafka</artifactId>
3333
</dependency>
34-
<dependency>
35-
<groupId>com.oracle.database.security</groupId>
36-
<artifactId>oraclepki</artifactId>
37-
</dependency>
3834
<dependency>
3935
<groupId>com.oracle.developers.oracleteq</groupId>
4036
<artifactId>oracle-developers-okafka-config</artifactId>
@@ -59,24 +55,59 @@
5955
<groupId>org.springframework.boot</groupId>
6056
<artifactId>spring-boot-starter-web</artifactId>
6157
</dependency>
58+
<dependency>
59+
<groupId>org.springframework.boot</groupId>
60+
<artifactId>spring-boot-configuration-processor</artifactId>
61+
<optional>true</optional>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.springframework.boot</groupId>
65+
<artifactId>spring-boot-starter-test</artifactId>
66+
<scope>test</scope>
67+
</dependency>
6268
<dependency>
6369
<groupId>org.apache.avro</groupId>
6470
<artifactId>avro</artifactId>
6571
</dependency>
6672
<dependency>
6773
<groupId>com.oracle.database.jdbc</groupId>
68-
<artifactId>ojdbc8</artifactId>
69-
<scope>runtime</scope>
74+
<artifactId>ojdbc11</artifactId>
7075
</dependency>
7176
<dependency>
72-
<groupId>org.springframework.boot</groupId>
73-
<artifactId>spring-boot-configuration-processor</artifactId>
74-
<optional>true</optional>
77+
<groupId>com.oracle.database.jdbc</groupId>
78+
<artifactId>ucp</artifactId>
7579
</dependency>
7680
<dependency>
77-
<groupId>org.springframework.boot</groupId>
78-
<artifactId>spring-boot-starter-test</artifactId>
79-
<scope>test</scope>
81+
<groupId>com.oracle.database.security</groupId>
82+
<artifactId>oraclepki</artifactId>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.oracle.database.security</groupId>
86+
<artifactId>osdt_core</artifactId>
87+
</dependency>
88+
<dependency>
89+
<groupId>com.oracle.database.security</groupId>
90+
<artifactId>osdt_cert</artifactId>
91+
</dependency>
92+
<dependency>
93+
<groupId>com.oracle.database.messaging</groupId>
94+
<artifactId>aqapi</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>javax.jms</groupId>
98+
<artifactId>javax.jms-api</artifactId>
99+
</dependency>
100+
<dependency>
101+
<groupId>javax.transaction</groupId>
102+
<artifactId>javax.transaction-api</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>javax.transaction</groupId>
106+
<artifactId>jta</artifactId>
107+
</dependency>
108+
<dependency>
109+
<groupId>javax.annotation</groupId>
110+
<artifactId>javax.annotation-api</artifactId>
80111
</dependency>
81112
</dependencies>
82113

‎workshops/oracleteq-kafka/springboot-oracleteq/okafka-producer/pom.xml‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<groupId>org.oracle.okafka</groupId>
3535
<artifactId>okafka</artifactId>
3636
</dependency>
37-
<dependency>
38-
<groupId>com.oracle.database.security</groupId>
39-
<artifactId>oraclepki</artifactId>
40-
</dependency>
4137
<dependency>
4238
<groupId>com.oracle.developers.oracleteq</groupId>
4339
<artifactId>oracle-developers-okafka-config</artifactId>
@@ -62,24 +58,59 @@
6258
<groupId>org.springframework.boot</groupId>
6359
<artifactId>spring-boot-starter-web</artifactId>
6460
</dependency>
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-configuration-processor</artifactId>
64+
<optional>true</optional>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.springframework.boot</groupId>
68+
<artifactId>spring-boot-starter-test</artifactId>
69+
<scope>test</scope>
70+
</dependency>
6571
<dependency>
6672
<groupId>org.apache.avro</groupId>
6773
<artifactId>avro</artifactId>
6874
</dependency>
6975
<dependency>
7076
<groupId>com.oracle.database.jdbc</groupId>
71-
<artifactId>ojdbc8</artifactId>
72-
<scope>runtime</scope>
77+
<artifactId>ojdbc11</artifactId>
7378
</dependency>
7479
<dependency>
75-
<groupId>org.springframework.boot</groupId>
76-
<artifactId>spring-boot-configuration-processor</artifactId>
77-
<optional>true</optional>
80+
<groupId>com.oracle.database.jdbc</groupId>
81+
<artifactId>ucp</artifactId>
7882
</dependency>
7983
<dependency>
80-
<groupId>org.springframework.boot</groupId>
81-
<artifactId>spring-boot-starter-test</artifactId>
82-
<scope>test</scope>
84+
<groupId>com.oracle.database.security</groupId>
85+
<artifactId>oraclepki</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>com.oracle.database.security</groupId>
89+
<artifactId>osdt_core</artifactId>
90+
</dependency>
91+
<dependency>
92+
<groupId>com.oracle.database.security</groupId>
93+
<artifactId>osdt_cert</artifactId>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.oracle.database.messaging</groupId>
97+
<artifactId>aqapi</artifactId>
98+
</dependency>
99+
<dependency>
100+
<groupId>javax.jms</groupId>
101+
<artifactId>javax.jms-api</artifactId>
102+
</dependency>
103+
<dependency>
104+
<groupId>javax.transaction</groupId>
105+
<artifactId>javax.transaction-api</artifactId>
106+
</dependency>
107+
<dependency>
108+
<groupId>javax.transaction</groupId>
109+
<artifactId>jta</artifactId>
110+
</dependency>
111+
<dependency>
112+
<groupId>javax.annotation</groupId>
113+
<artifactId>javax.annotation-api</artifactId>
83114
</dependency>
84115
</dependencies>
85116

0 commit comments

Comments
 (0)