From a903dc1e3403aff8c9e48c595143d9c741fa4fb6 Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Wed, 8 May 2024 14:30:17 +0200 Subject: [PATCH 1/3] * update dependencies for oracle from 19.9.0.0 to 23.4.0.24.05 --- .../deegree-sqldialect-oracle/pom.xml | 2 +- .../deegree-coveragestore-oracle-georaster/pom.xml | 4 ++-- deegree-services/deegree-webservices/pom.xml | 2 +- pom.xml | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml index 007785c2ce..d3e57a950b 100644 --- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml +++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml @@ -28,7 +28,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc11 org.locationtech.jts diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml index a42c97ee18..084483f3cc 100644 --- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml +++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml @@ -65,7 +65,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc11 com.oracle @@ -88,7 +88,7 @@ xdb - com.oracle + com.oracle.database.xml xmlparserv2_sans_jaxp_services diff --git a/deegree-services/deegree-webservices/pom.xml b/deegree-services/deegree-webservices/pom.xml index 04560c6bdb..9994f855d8 100644 --- a/deegree-services/deegree-webservices/pom.xml +++ b/deegree-services/deegree-webservices/pom.xml @@ -170,7 +170,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc11 diff --git a/pom.xml b/pom.xml index 5ebb6bb39e..c21d422d01 100644 --- a/pom.xml +++ b/pom.xml @@ -866,7 +866,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc11 ${oracle.version} @@ -890,8 +890,9 @@ sdoutl ${oracle.version} + - com.oracle + com.oracle.database.xml xmlparserv2_sans_jaxp_services ${oracle.version} @@ -1235,7 +1236,7 @@ ${user.home}/Sites 11 3.5.3 - 19.9.0.0 + 23.4.0.24.05 2.23.1 2.0.12 2.7.18 From 9c0d5a87c6a6fc9fc7a8795dded4bc590a0fb888 Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Wed, 8 May 2024 15:40:57 +0200 Subject: [PATCH 2/3] * update handbook --- .../src/main/asciidoc/javamodules.adoc | 15 +++++---------- .../src/main/asciidoc/serverconnections.adoc | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc index ecb1f0f662..55e1b9eaa6 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc @@ -125,20 +125,15 @@ add the following JAR files (see <>): ** sdogr.jar ** sdotype.jar ** sdoutl.jar -** xdb6.jar +** xdb.jar ** xmlparserv2_sans_jaxp_services.jar NOTE: The Oracle Spatial and GeoRaster libraries can be found, without version number in filename, inside the Oracle Database installation directory. -The _sdo*_ files can be found at _ORACLE_HOME/md/jlib_, xdb6.jar at -_ORACLE_HOME/rdbms/jlib_ and xmlparserv2_sans_jaxp_services or -xmlparserv2 at _ORACLE_HOME/xdk/lib_. - -NOTE: The _xmlparserv2_sans_jaxp_services_ is the recommended library, as it -does not contain _META-INF/services/_ entries. But if this library is -not available the _xmlparserv2_ can be used instead. (In rare -conditions this could set the oracle library as default XML parser, -which could lead to unexpected behavior). +The _sdo*_ files can be found at _ORACLE_HOME/md/jlib_, xdb.jar and +xmlparserv2_sans_jaxp_services.jar are available at maven central +xdb:[https://repo1.maven.org/maven2/com/oracle/database/xml/xdb/] and +xmlparserv2_sans_jaxp_services:[https://repo1.maven.org/maven2/com/oracle/database/xml/xmlparserv2_sans_jaxp_services/]. [[anchor-sqlserverjars]] ==== Adding Microsoft SQL server support diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc index 2bd401f645..cbbd88a67b 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc @@ -31,8 +31,8 @@ PostgreSQL/PostGIS, Oracle Spatial or Microsoft SQL Server. deegree currently supports the following backends: * PostgreSQL 12+ with PostGIS extension 3.0+ -* Oracle Spatial 18.3, 19.x and 21.1 -** https://www.oracle.com/de/database/technologies/faq-jdbc.html[See compatibility matrix of driver version 19.9] +* Oracle Spatial 19.x, 21.x and 23.3 +** https://www.oracle.com/de/database/technologies/faq-jdbc.html[See compatibility matrix of driver version 23.3] * Microsoft SQL Server 2012, 2014, 2016, 2017 and 2019 ** https://learn.microsoft.com/en-us/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix[See compatibility matrix of driver version 10.2] From cbb3e00800c97f1de1eecaf83693d2ec1105a44a Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Wed, 22 May 2024 17:42:02 +0200 Subject: [PATCH 3/3] Update link for english documentation --- .../src/main/asciidoc/serverconnections.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc index cbbd88a67b..66ff98f078 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc @@ -32,7 +32,7 @@ deegree currently supports the following backends: * PostgreSQL 12+ with PostGIS extension 3.0+ * Oracle Spatial 19.x, 21.x and 23.3 -** https://www.oracle.com/de/database/technologies/faq-jdbc.html[See compatibility matrix of driver version 23.3] +** https://www.oracle.com/database/technologies/faq-jdbc.html[See compatibility matrix of driver version 23.3] * Microsoft SQL Server 2012, 2014, 2016, 2017 and 2019 ** https://learn.microsoft.com/en-us/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix[See compatibility matrix of driver version 10.2]