Merge branch 'development'

paulissoft · May 14, 2024 · f414700 · f414700
2 parents 520961a + 7d747fe
commit f414700
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 47 deletions.
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -1,10 +1,10 @@
 name: Publish package to GitHub Packages
 on:
-  push:
-    branches:
-      - master
-#  release:
-#    types: [created]
+#  push:
+#    branches:
+#      - master
+  release:
+    types: [created]
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -22,13 +22,13 @@ jobs:
         uses: whelk-io/maven-settings-xml-action@v22
         with:
           servers: '[{ "id": "github-paulissoft", "username": "x-access-token", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
-      - name: Show contents of settings.xml
-        run: mvn help:effective-settings -q -Doutput=/dev/stdout -DshowPasswords=true
-      - name: Show environment
-        run: env | sort
+#      - name: Show contents of settings.xml
+#        run: mvn help:effective-settings -q -Doutput=/dev/stdout -DshowPasswords=true
+#      - name: Show environment
+#        run: env | sort
       - name: Publish package in root
-        if: github.ref == 'refs/heads/master'
+#        if: github.ref == 'refs/heads/master'
         run: mvn --batch-mode -N deploy
       - name: Publish package in jdbc directory
-        if: github.ref == 'refs/heads/master'
+#        if: github.ref == 'refs/heads/master'
         run: mvn --batch-mode -f jdbc/pom.xml deploy
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +1 @@
--Drevision=3.0.1
+-Drevision=3.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,12 @@ Types of changes:
 
 ## [Unreleased]
 
+## [3.1.0] - 2024-05-14
+
+### Added
+
+- [Upgrade Maven dependencies.](https://github.com/paulissoft/oracle-tools/issues/158)
+
 ## [3.0.0] - 2024-05-13
 
 ### Changed

diff --git a/conf/app/pom.xml b/conf/app/pom.xml
@@ -22,6 +22,15 @@
     <db.password>${env.DB_PASSWORD}</db.password>
   </properties>
 
+  <!-- GJP 2024-05-14 Don't know why but seems necessary -->
+  <dependencies>
+    <dependency>
+      <groupId>${ojdbc.groupId}</groupId>
+      <artifactId>${ojdbc.artifactId}</artifactId>
+      <version>${ojdbc.version}</version>
+    </dependency>
+  </dependencies>
+
   <profiles>
     <profile>
       <id>test-connection</id>

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -36,9 +36,9 @@
     <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
     <HikariCP.version>3.4.2</HikariCP.version>
     <lombok.version>1.18.30</lombok.version>
-    <oracle.ojdbc.artifactId>ojdbc11</oracle.ojdbc.artifactId>
-    <oracle.ucp.artifactId>ucp11</oracle.ucp.artifactId>
-    <oracle.jdbc.version>23.3.0.23.09</oracle.jdbc.version>
+    <oracle.ojdbc.artifactId>${ojdbc.artifactId}</oracle.ojdbc.artifactId>
+    <oracle.ucp.artifactId>ucp${ojdbc.java.version}</oracle.ucp.artifactId>
+    <oracle.jdbc.version>${ojdbc.version}</oracle.jdbc.version>
     <spring.version>5.2.3.RELEASE</spring.version>
     <spring.boot.version>2.2.3.RELEASE</spring.boot.version>
     <commons-lang3.version>3.9</commons-lang3.version>
@@ -69,12 +69,12 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.oracle.database.jdbc</groupId>
+        <groupId>${ojdbc.groupId}</groupId>
         <artifactId>${oracle.ojdbc.artifactId}</artifactId>
         <version>${oracle.jdbc.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.oracle.database.jdbc</groupId>
+        <groupId>${ojdbc.groupId}</groupId>
         <artifactId>${oracle.ucp.artifactId}</artifactId>
         <version>${oracle.jdbc.version}</version>
       </dependency>
@@ -162,12 +162,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.oracle.database.jdbc</groupId>
+      <groupId>${ojdbc.groupId}</groupId>
       <artifactId>${oracle.ojdbc.artifactId}</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.oracle.database.jdbc</groupId>
+      <groupId>${ojdbc.groupId}</groupId>
       <artifactId>${oracle.ucp.artifactId}</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/jdbc/smart-pool-data-source-jmh/pom.xml b/jdbc/smart-pool-data-source-jmh/pom.xml
@@ -15,7 +15,6 @@
   </parent-->
   <groupId>com.paulissoft.pato.jdbc</groupId>
   <artifactId>smart-pool-data-source-jmh</artifactId>
-  <name>spring-boot-complete</name>
   <description>Demo project for Spring Boot</description>
 
   <properties>

diff --git a/pom.xml b/pom.xml
@@ -13,38 +13,42 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!--maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version-->
-    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <!--maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version-->
+    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+    <java.version>11</java.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.argument>-Xlint:deprecation</maven.compiler.argument>
 
     <!-- plugins from super pom without version -->
-    <!--maven-clean-plugin.version>3.1.0</maven-clean-plugin.version-->
-    <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-    <!--maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version-->
-    <maven-deploy-plugin.version>3.0.0-M2</maven-deploy-plugin.version>
-    <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
-    <!--maven-site-plugin.version>3.9.1</maven-site-plugin.version-->
-    <maven-site-plugin.version>4.0.0-M1</maven-site-plugin.version>
+    <!--maven-clean-plugin.version>3.2.0</maven-clean-plugin.version-->
+    <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+    <!--maven-deploy-plugin.version>3.0.0-M2</maven-deploy-plugin.version-->
+    <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
+    <!--maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version-->
+    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
+    <!--maven-site-plugin.version>4.0.0-M1</maven-site-plugin.version-->
+    <maven-site-plugin.version>4.0.0-M14</maven-site-plugin.version>
 
-    <!--maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version-->
-    <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
+    <!--maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version-->
+    <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
     <!--maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version-->
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <!--maven-antrun-plugin.version>1.8</maven-antrun-plugin.version-->
     <!-- WARNING: 20020829 is not newer, just use 1.0b3 -->
     <maven-ant-contrib-plugin.version>1.0b3</maven-ant-contrib-plugin.version>
-    <!--maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version-->
-    <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
-    <maven.minimum.version>3.6.1</maven.minimum.version>
-    <!--flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version-->
-    <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
-    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-    <!--properties-maven-plugin.version>1.0.0</properties-maven-plugin.version-->
-    <properties-maven-plugin.version>1.2.0</properties-maven-plugin.version>
-    <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-    <sql-maven-plugin.version>1.5</sql-maven-plugin.version>
+    <!--maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version-->
+    <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+    <maven.minimum.version>3.6.3</maven.minimum.version>
+    <!--flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version-->
+    <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
+    <!--maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version-->
+    <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+    <!--properties-maven-plugin.version>1.2.0</properties-maven-plugin.version-->
+    <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
+    <!--exec-maven-plugin.version>3.0.0</exec-maven-plugin.version-->
+    <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
+    <sql-maven-plugin.version>3.0.0</sql-maven-plugin.version>
     <!-- Begin of SCM section -->
     <!-- DO NOT UPDATE the SCM plugin: last version that is compatible with maven-scm-provider-svnjava and svnkit -->
     <maven-scm-plugin.version>1.9.5</maven-scm-plugin.version>
@@ -61,14 +65,15 @@
     <!-- flyway.version>7.4.0</flyway.version--> <!-- does not support Oracle 19.1 -->
     <!--flyway.version>9.22.0</flyway.version--> <!-- latest and greatest at 2023-09-06 -->
 
-    <flyway.version>10.10.0</flyway.version> <!-- latest and greatest at 2024-03-14 -->
+    <!--flyway.version>10.13.0</flyway.version--> <!-- latest and greatest at 2024-03-14 -->
+    <flyway.version>10.13.0</flyway.version> <!-- latest and greatest at 2024-05-14 -->
 
     <!-- Oracle JDBC stuff -->
     <!-- https://www.oracle.com/database/technologies/maven-central-guide.html -->
     <ojdbc.groupId>com.oracle.database.jdbc</ojdbc.groupId>
-    <ojdb.java.version>8</ojdb.java.version>
-    <ojdbc.artifactId>ojdbc${ojdb.java.version}-production</ojdbc.artifactId> <!-- compatible with Java 8 -->
-    <ojdbc.version>23.2.0.0</ojdbc.version>
+    <ojdbc.java.version>11</ojdbc.java.version>  <!-- compatible with Java 11 -->
+    <ojdbc.artifactId>ojdbc${ojdbc.java.version}</ojdbc.artifactId>
+    <ojdbc.version>23.3.0.23.09</ojdbc.version>
     <!-- GJP 2023-09-05  Version 3.1.4 is the latest version to work with JDBC thin driver and a TNS NAMES entry. -->
     <!-- For 3.1.5 you get: -->
     <!-- IO Error: The Network Adapter could not establish the connection: Unable to initialize ssl context. Unable to initialize the key store. SSO not found: SSO KeyStore not available -->
@@ -290,6 +295,17 @@
         <inherited>false</inherited>
       </plugin>
       <!-- end of root only plugins used by this and other projects -->
+      <!--
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+        </plugin>
+      -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>