Removes Oracle Maven Repository information (#1040)

Removes Oracle Maven Repository information now that it is no longer needed; removes integrations profile Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
2026-03-10 08:21:17 +00:00 · 2019-09-17 16:12:15 -07:00
parent 75362098df
commit 2ea20dcb74
16 changed files with 117 additions and 302 deletions
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -541,12 +541,12 @@
                <version>${version.lib.h2}</version>
            </dependency>
            <dependency>
-                <groupId>com.oracle.jdbc</groupId>
+                <groupId>com.oracle.ojdbc</groupId>
                <artifactId>ojdbc8</artifactId>
                <version>${version.lib.ojdbc8}</version>
            </dependency>
            <dependency>
-                <groupId>com.oracle.jdbc</groupId>
+                <groupId>com.oracle.ojdbc</groupId>
                <artifactId>ucp</artifactId>
                <version>${version.lib.ucp}</version>
            </dependency>
--- 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"
--- 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"
--- 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
--- 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
+EXPOSE 8080
--- 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');
-```
+```
--- a/examples/employee-app/pom.xml
+++ b/examples/employee-app/pom.xml
@@ -38,7 +38,7 @@

    <dependencies>
        <dependency>
-            <groupId>com.oracle.jdbc</groupId>
+            <groupId>com.oracle.ojdbc</groupId>
            <artifactId>ojdbc8</artifactId>
        </dependency>
        <dependency>
@@ -82,18 +82,4 @@
        </plugins>
    </build>

-    <!-- com.oracle:jdbc:odjbc8 requires the maven oracle repository -->
-    <repositories>
-        <repository>
-            <id>maven.oracle.com</id>
-            <url>https://maven.oracle.com</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
--- a/examples/employee-app/settings.xml
+++ b/examples/employee-app/settings.xml
@@ -1,63 +0,0 @@
-<!--
-
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-->
-<settings>
-    <profiles>
-        <profile>
-            <id>main</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>maven.oracle.com</id>
-                    <url>https://maven.oracle.com</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-
-    <servers>
-        <server>
-            <id>maven.oracle.com</id>
-            <username>username</username>
-            <password>password</password>
-            <configuration>
-                <basicAuthScope>
-                    <host>ANY</host>
-                    <port>ANY</port>
-                    <realm>OAM 11g</realm>
-                </basicAuthScope>
-                <httpConfiguration>
-                    <all>
-                        <params>
-                            <property>
-                                <name>http.protocol.allow-circular-redirects
-                                </name>
-                                <value>%b,true</value>
-                            </property>
-                        </params>
-                    </all>
-                </httpConfiguration>
-            </configuration>
-        </server>
-    </servers>
-</settings>
--- a/examples/integrations/cdi/datasource-hikaricp/pom.xml
+++ b/examples/integrations/cdi/datasource-hikaricp/pom.xml
@@ -56,7 +56,7 @@

        <!-- Runtime-scoped dependencies. -->
        <dependency>
-            <groupId>com.oracle.jdbc</groupId>
+            <groupId>com.oracle.ojdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <scope>runtime</scope>
        </dependency>
@@ -125,16 +125,4 @@
            </plugin>
        </plugins>
    </build>
-
-    <!-- com.oracle:jdbc:odjbc8 requires the maven oracle repository -->
-    <repositories>
-        <repository>
-            <id>maven.oracle.com</id>
-            <url>https://maven.oracle.com</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
 </project>
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -48,6 +48,8 @@
        <module>todo-app</module>
        <module>translator-app</module>
        <module>webserver</module>
+        <module>integrations</module>
+        <module>employee-app</module>
    </modules>

    <build>
@@ -64,13 +66,4 @@
        </pluginManagement>
    </build>

-    <profiles>
-        <profile>
-            <id>integrations</id>
-            <modules>
-                <module>integrations</module>
-                <module>employee-app</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
--- a/integrations/cdi/datasource-ucp/pom.xml
+++ b/integrations/cdi/datasource-ucp/pom.xml
@@ -46,15 +46,14 @@
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>com.oracle.jdbc</groupId>
+            <groupId>com.oracle.ojdbc</groupId>
            <artifactId>ucp</artifactId>
            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.oracle.jdbc</groupId>
-                    <artifactId>ojdbc10</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.ojdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.eclipse.microprofile.config</groupId>
@@ -129,17 +128,4 @@
        </plugins>
    </build>

-    <repositories>
-        <repository>
-            <id>maven.oracle.com</id>
-            <url>https://maven.oracle.com</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
--- 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)
--- a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml
+++ b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/pom.xml
@@ -39,7 +39,7 @@
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>com.oracle.jdbc</groupId>
+            <groupId>com.oracle.ojdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <scope>runtime</scope>
            <optional>true</optional>
@@ -62,20 +62,4 @@
        </dependency>
    </dependencies>

-    <!--
-        com.oracle:jdbc:odjbc8 requires the maven oracle repository
-    -->
-    <repositories>
-        <repository>
-            <id>maven.oracle.com</id>
-            <url>https://maven.oracle.com</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
--- a/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml
+++ b/integrations/serviceconfiguration/serviceconfiguration-ucp-accs/pom.xml
@@ -41,7 +41,7 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>com.oracle.jdbc</groupId>
+            <groupId>com.oracle.ojdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <scope>runtime</scope>
            <optional>true</optional>
@@ -59,20 +59,4 @@
        </dependency>
    </dependencies>

-    <!--
-        com.oracle:jdbc:odjbc8 requires the maven oracle repository
-    -->
-    <repositories>
-        <repository>
-            <id>maven.oracle.com</id>
-            <url>https://maven.oracle.com</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
--- a/javadocs/pom.xml
+++ b/javadocs/pom.xml
@@ -338,110 +338,106 @@
            <groupId>io.helidon.openapi</groupId>
            <artifactId>helidon-openapi</artifactId>
        </dependency>
+        <!-- Integrations -->
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-config-source</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-hikaricp-accs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-hikaricp-localhost</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-hikaricp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-ucp-accs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-ucp-localhost</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-ucp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-system-kubernetes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.serviceconfiguration</groupId>
+            <artifactId>helidon-serviceconfiguration-system-oracle-accs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-datasource</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-datasource-hikaricp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-delegates</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-eclipselink</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-hibernate</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-jedis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-oci-objectstorage</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-reference-counted-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>javax.transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-jpa-weld</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.cdi</groupId>
+            <artifactId>helidon-integrations-cdi-jta-weld</artifactId>
+        </dependency>
    </dependencies>

    <profiles>
-        <profile>
-            <id>integrations</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-config-source</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-hikaricp-accs</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-hikaricp-localhost</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-hikaricp</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-ucp-accs</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-ucp-localhost</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-ucp</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-system-kubernetes</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.serviceconfiguration</groupId>
-                    <artifactId>helidon-serviceconfiguration-system-oracle-accs</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-datasource</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-datasource-hikaricp</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-delegates</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-eclipselink</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-hibernate</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-jedis</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-oci-objectstorage</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-reference-counted-context</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.transaction</groupId>
-                    <artifactId>javax.transaction-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-jpa</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-jpa-weld</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-jta</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.helidon.integrations.cdi</groupId>
-                    <artifactId>helidon-integrations-cdi-jta-weld</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
        <profile>
            <id>release</id>
            <build>
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,7 @@
        <module>openapi</module>
        <module>jersey</module>
        <module>webclient</module>
+        <module>integrations</module>
    </modules>

    <build>
@@ -840,12 +841,6 @@
                <module>examples</module>
            </modules>
        </profile>
-        <profile>
-            <id>integrations</id>
-            <modules>
-                <module>integrations</module>
-            </modules>
-        </profile>
        <profile>
            <id>archetypes</id>
            <modules>