diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index 8c2617efe..2977287c9 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -541,12 +541,12 @@ ${version.lib.h2} - com.oracle.jdbc + com.oracle.ojdbc ojdbc8 ${version.lib.ojdbc8} - com.oracle.jdbc + com.oracle.ojdbc ucp ${version.lib.ucp} diff --git a/etc/scripts/checkstyle.sh b/etc/scripts/checkstyle.sh index 785fcf707..4e853dcda 100755 --- a/etc/scripts/checkstyle.sh +++ b/etc/scripts/checkstyle.sh @@ -49,7 +49,7 @@ mvn checkstyle:checkstyle-aggregate \ -f ${WS_DIR}/pom.xml \ -Dcheckstyle.output.format=plain \ -Dcheckstyle.output.file=${RESULT_FILE} \ - -Pexamples,integrations,ossrh-releases > ${LOG_FILE} 2>&1 || (cat ${LOG_FILE} ; exit 1) + -Pexamples,ossrh-releases > ${LOG_FILE} 2>&1 || (cat ${LOG_FILE} ; exit 1) grep "^\[ERROR\]" ${RESULT_FILE} \ && die "CHECKSTYLE ERROR" || echo "CHECKSTYLE OK" diff --git a/etc/scripts/copyright.sh b/etc/scripts/copyright.sh index 966db469e..f8a1eff9a 100755 --- a/etc/scripts/copyright.sh +++ b/etc/scripts/copyright.sh @@ -66,7 +66,7 @@ mvn -q org.glassfish.copyright:glassfish-copyright-maven-plugin:copyright \ -Dcopyright.exclude=${WS_DIR}/etc/copyright-exclude.txt \ -Dcopyright.template=${WS_DIR}/etc/copyright.txt \ -Dcopyright.scm=git \ - -Pexamples,integrations,docs,ossrh-releases,tests > ${RESULT_FILE} || die "Error running the Maven command" + -Pexamples,docs,ossrh-releases,tests > ${RESULT_FILE} || die "Error running the Maven command" grep -i "copyright" ${RESULT_FILE} \ && die "COPYRIGHT ERROR" || echo "COPYRIGHT OK" diff --git a/etc/scripts/release.sh b/etc/scripts/release.sh index 0ebf6dddf..908860c28 100755 --- a/etc/scripts/release.sh +++ b/etc/scripts/release.sh @@ -227,7 +227,7 @@ release_build(){ echo "Nexus staging repository ID: ${STAGING_REPO_ID}" # Perform deployment - mvn -B clean deploy -Prelease,integrations,archetypes -DskipTests \ + mvn -B clean deploy -Prelease,archetypes -DskipTests \ -Dgpg.passphrase="${GPG_PASSPHRASE}" \ -DstagingRepositoryId=${STAGING_REPO_ID} \ -DretryFailedDeploymentCount=10 diff --git a/examples/employee-app/Dockerfile b/examples/employee-app/Dockerfile index f45573372..210db9ad8 100644 --- a/examples/employee-app/Dockerfile +++ b/examples/employee-app/Dockerfile @@ -22,7 +22,6 @@ WORKDIR /helidon # Create a first layer to cache the "Maven World" in the local repository. # Incremental docker builds will always resume after that, unless you update # the pom -ADD settings.xml /root/.m2/settings.xml ADD pom.xml . RUN mvn package -DskipTests @@ -43,4 +42,4 @@ COPY --from=build /helidon/target/libs ./libs CMD ["java", "-jar", "helidon-examples-employee-app"] -EXPOSE 8080 \ No newline at end of file +EXPOSE 8080 diff --git a/examples/employee-app/README.md b/examples/employee-app/README.md index b4d1c6860..393b64aab 100644 --- a/examples/employee-app/README.md +++ b/examples/employee-app/README.md @@ -9,24 +9,6 @@ By default the service uses a ArrayList backend with sample data. You can connec the backend application to an Oracle database by changing the values in the `resources/DbCreds.properties` file. -## Using Oracle DB - -This application supports two storage implementations one using an array and - other using an Oracle database to persist the data. To compile and package the - application you need the JDBC driver. The JDBC driver for the Oracle DB is only available from the -https://www.oracle.com/webfolder/application/maven/index.html[Oracle Maven Repository]. - -This means that you have to configure the repository in order to add the driver - to your classpath. - -Follow these steps: - -- Go to https://www.oracle.com/webfolder/application/maven/index.html and - accept the license -- Create an OTN account -- Update your settings.xml as documented - https://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9016[here] - ## Build and run With JDK8+ @@ -289,4 +271,4 @@ INSERT INTO EMPLOYEE (ID, FIRSTNAME, LASTNAME, EMAIL, PHONE, BIRTHDATE, TITLE, D INSERT INTO EMPLOYEE (ID, FIRSTNAME, LASTNAME, EMAIL, PHONE, BIRTHDATE, TITLE, DEPARTMENT) VALUES (EMPLOYEE_SEQ.nextVal, 'Zora', 'Sawayn', 'Zora.Sawayn@example.com', '923-555-0161', '1978-03-18', 'Dynamic Marketing Designer', 'Security'); INSERT INTO EMPLOYEE (ID, FIRSTNAME, LASTNAME, EMAIL, PHONE, BIRTHDATE, TITLE, DEPARTMENT) VALUES (EMPLOYEE_SEQ.nextVal, 'Cordia', 'Willms', 'Cordia.Willms@example.com', '778-555-0187', '1989-03-31', 'Human Division Representative', 'Optimization'); -``` \ No newline at end of file +``` diff --git a/examples/employee-app/pom.xml b/examples/employee-app/pom.xml index d6a51158a..63c743d3c 100644 --- a/examples/employee-app/pom.xml +++ b/examples/employee-app/pom.xml @@ -38,7 +38,7 @@ - com.oracle.jdbc + com.oracle.ojdbc ojdbc8 @@ -82,18 +82,4 @@ - - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - false - - - diff --git a/examples/employee-app/settings.xml b/examples/employee-app/settings.xml deleted file mode 100644 index b1a598ec1..000000000 --- a/examples/employee-app/settings.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - main - - true - - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - - - - - - - maven.oracle.com - username - password - - - ANY - ANY - OAM 11g - - - - - - http.protocol.allow-circular-redirects - - %b,true - - - - - - - - diff --git a/examples/integrations/cdi/datasource-hikaricp/pom.xml b/examples/integrations/cdi/datasource-hikaricp/pom.xml index 9107037ae..8a40ad91b 100644 --- a/examples/integrations/cdi/datasource-hikaricp/pom.xml +++ b/examples/integrations/cdi/datasource-hikaricp/pom.xml @@ -56,7 +56,7 @@ - com.oracle.jdbc + com.oracle.ojdbc ojdbc8 runtime @@ -125,16 +125,4 @@ - - - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - diff --git a/examples/pom.xml b/examples/pom.xml index 96bf55bf4..aff298043 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -48,6 +48,8 @@ todo-app translator-app webserver + integrations + employee-app @@ -64,13 +66,4 @@ - - - integrations - - integrations - employee-app - - - diff --git a/integrations/cdi/datasource-ucp/pom.xml b/integrations/cdi/datasource-ucp/pom.xml index cb1e23b6e..f035b2a48 100644 --- a/integrations/cdi/datasource-ucp/pom.xml +++ b/integrations/cdi/datasource-ucp/pom.xml @@ -46,15 +46,14 @@ compile - com.oracle.jdbc + com.oracle.ojdbc ucp compile - - - com.oracle.jdbc - ojdbc10 - - + + + com.oracle.ojdbc + ojdbc8 + compile org.eclipse.microprofile.config @@ -129,17 +128,4 @@ - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - false - - - diff --git a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/README.md b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/README.md index 00d6f0b78..4de57559e 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/README.md +++ b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/README.md @@ -17,18 +17,3 @@ When your program is running on the Application Container Cloud Service platform, Hikari connection pool information will be made available to programs using the Helidon Service Configuration Framework. - -## Using Oracle DB - -The JDBC driver for the Oracle DB is only available from the - [Oracle Maven Repository](https://www.oracle.com/webfolder/application/maven/index.html). - -This means that you have to configure the repository in order to add the driver - to your classpath. - -Follow these steps: - -- Go to https://www.oracle.com/webfolder/application/maven/index.html and - accept the license -- Create an OTN account -- Update your settings.xml as documented [here](https://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9016) diff --git a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml index 5e32428b0..241434536 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml +++ b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml @@ -39,7 +39,7 @@ compile - com.oracle.jdbc + com.oracle.ojdbc ojdbc8 runtime true @@ -62,20 +62,4 @@ - - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - false - - - diff --git a/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml b/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml index 0330eed46..1c53c603d 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml +++ b/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml @@ -41,7 +41,7 @@ test - com.oracle.jdbc + com.oracle.ojdbc ojdbc8 runtime true @@ -59,20 +59,4 @@ - - - - maven.oracle.com - https://maven.oracle.com - default - - true - - - false - - - diff --git a/javadocs/pom.xml b/javadocs/pom.xml index 65a24678e..cab8a929b 100644 --- a/javadocs/pom.xml +++ b/javadocs/pom.xml @@ -338,110 +338,106 @@ io.helidon.openapi helidon-openapi + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-api + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-config-source + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-hikaricp-accs + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-hikaricp-localhost + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-hikaricp + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-ucp-accs + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-ucp-localhost + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-ucp + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-system-kubernetes + + + io.helidon.serviceconfiguration + helidon-serviceconfiguration-system-oracle-accs + + + io.helidon.integrations.cdi + helidon-integrations-cdi-datasource + + + io.helidon.integrations.cdi + helidon-integrations-cdi-datasource-hikaricp + + + io.helidon.integrations.cdi + helidon-integrations-cdi-datasource-ucp + + + io.helidon.integrations.cdi + helidon-integrations-cdi-delegates + + + io.helidon.integrations.cdi + helidon-integrations-cdi-eclipselink + + + io.helidon.integrations.cdi + helidon-integrations-cdi-hibernate + + + io.helidon.integrations.cdi + helidon-integrations-cdi-jedis + + + io.helidon.integrations.cdi + helidon-integrations-cdi-oci-objectstorage + + + io.helidon.integrations.cdi + helidon-integrations-cdi-reference-counted-context + + + javax.transaction + javax.transaction-api + + + io.helidon.integrations.cdi + helidon-integrations-cdi-jpa + + + io.helidon.integrations.cdi + helidon-integrations-cdi-jpa-weld + + + io.helidon.integrations.cdi + helidon-integrations-cdi-jta + + + io.helidon.integrations.cdi + helidon-integrations-cdi-jta-weld + - - integrations - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-api - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-config-source - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-hikaricp-accs - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-hikaricp-localhost - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-hikaricp - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-ucp-accs - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-ucp-localhost - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-ucp - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-system-kubernetes - - - io.helidon.serviceconfiguration - helidon-serviceconfiguration-system-oracle-accs - - - io.helidon.integrations.cdi - helidon-integrations-cdi-datasource - - - io.helidon.integrations.cdi - helidon-integrations-cdi-datasource-hikaricp - - - io.helidon.integrations.cdi - helidon-integrations-cdi-datasource-ucp - - - io.helidon.integrations.cdi - helidon-integrations-cdi-delegates - - - io.helidon.integrations.cdi - helidon-integrations-cdi-eclipselink - - - io.helidon.integrations.cdi - helidon-integrations-cdi-hibernate - - - io.helidon.integrations.cdi - helidon-integrations-cdi-jedis - - - io.helidon.integrations.cdi - helidon-integrations-cdi-oci-objectstorage - - - io.helidon.integrations.cdi - helidon-integrations-cdi-reference-counted-context - - - javax.transaction - javax.transaction-api - - - io.helidon.integrations.cdi - helidon-integrations-cdi-jpa - - - io.helidon.integrations.cdi - helidon-integrations-cdi-jpa-weld - - - io.helidon.integrations.cdi - helidon-integrations-cdi-jta - - - io.helidon.integrations.cdi - helidon-integrations-cdi-jta-weld - - - release diff --git a/pom.xml b/pom.xml index 59594db71..285874076 100644 --- a/pom.xml +++ b/pom.xml @@ -162,6 +162,7 @@ openapi jersey webclient + integrations @@ -840,12 +841,6 @@ examples - - integrations - - integrations - - archetypes