Skip to content

Commit d1cbf7b

Browse files
authored
Merge pull request #14 from paulparkinson/main
graalvm mods - all working with 21.0.3-graal
2 parents e903808 + a21d424 commit d1cbf7b

File tree

15 files changed

+35
-333
lines changed

15 files changed

+35
-333
lines changed

graalvm-nativeimage/helidon/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@
4343
<artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>
4444
<scope>runtime</scope>
4545
</dependency>
46+
<!-- <dependency>-->
47+
<!-- <groupId>io.helidon.integrations.cdi</groupId>-->
48+
<!-- <artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>-->
49+
<!-- <exclusions>-->
50+
<!-- <exclusion>-->
51+
<!-- <groupId>com.oracle.database.ha</groupId>-->
52+
<!-- <artifactId>ons</artifactId>-->
53+
<!-- </exclusion>-->
54+
<!-- <exclusion>-->
55+
<!-- <groupId>com.oracle.database.ha</groupId>-->
56+
<!-- <artifactId>simplefan</artifactId>-->
57+
<!-- </exclusion>-->
58+
<!-- </exclusions>-->
59+
<!-- </dependency>-->
4660
<dependency>
4761
<groupId>io.smallrye</groupId>
4862
<artifactId>jandex</artifactId>

graalvm-nativeimage/helidon/src/main/resources/META-INF/microprofile-config.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ javax.sql.DataSource.example.connectionFactoryClassName=oracle.jdbc.pool.OracleD
77
javax.sql.DataSource.example.URL=jdbc:oracle:thin:@<ATP_NAME>_high?TNS_ADMIN=/home/<YOUR_USER>/myatpwallet
88
javax.sql.DataSource.example.user=ADMIN
99
javax.sql.DataSource.example.password=<ADMIN_PASSWORD>
10+
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Args=-H:+RemoveSaturatedTypeFlows --initialize-at-build-time=com.oracle.helidon.datasource \
2-
--initialize-at-run-time=io.helidon.integrations.datasource.ucp.cdi.UniversalConnectionPool$_$$_WeldClientProxy \
32
--initialize-at-run-time=oracle.jdbc.driver.NTFListener \
43
--initialize-at-run-time=oracle.ucp.common.Service

graalvm-nativeimage/micronaut/src/main/java/com/oracle/dev/jdbc/micronaut/DataPopulator.java

Lines changed: 0 additions & 100 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.oracle.dev.jdbc.micronaut.controller;
2+
3+
import io.micronaut.http.annotation.Controller;
4+
import io.micronaut.http.annotation.Get;
5+
import io.micronaut.scheduling.TaskExecutors;
6+
import io.micronaut.scheduling.annotation.ExecuteOn;
7+
8+
import jakarta.validation.constraints.NotBlank;
9+
import java.util.List;
10+
import java.util.Optional;
11+
12+
13+
@Controller("/test")
14+
@ExecuteOn(TaskExecutors.IO)
15+
class TestController {
16+
17+
18+
}

graalvm-nativeimage/micronaut/src/main/java/com/oracle/dev/jdbc/micronaut/controller/ThingController.java

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

graalvm-nativeimage/micronaut/src/main/java/com/oracle/dev/jdbc/micronaut/domain/Thing.java

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

graalvm-nativeimage/micronaut/src/main/java/com/oracle/dev/jdbc/micronaut/repository/ThingRepository.java

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
micronaut.application.name=micronautguide
22

3-
flyway.datasources.default.enabled=true
4-
flyway.datasources.default.baseline-on-migrate=true
5-
flyway.datasources.default.baseline-version=1.0.0
6-
73
datasources.default.dialect=ORACLE
8-
datasources.default.url=jdbc:oracle:thin:@<ATP Name>_tp?TNS_ADMIN=/home/<myhomedir>/myatpwallet
4+
datasources.default.url=jdbc:oracle:thin:@<ATP_NAME>_high?TNS_ADMIN=/home/<YOUR_USER>/myatpwallet
95
datasources.default.username=ADMIN
10-
datasources.default.password=<password>
11-
6+
datasources.default.password=<ADMIN_PASSWORD>

graalvm-nativeimage/micronaut/src/terraform/adb-standard/adb.tf

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

0 commit comments

Comments
 (0)