diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d29744c2..3a207beb10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,57 +6,35 @@ The format is based on [Common Changelog](https://common-changelog.org/). ## [8.1.8 Build GH_POST_PR_COMMIT_RUN_ID] - 2026-08-13 -### Fixed (Task 8 — trustmanager + hostname + URL-forward + ReDoS) - -Closes 4 CodeQL alerts with real fixes (no paths-ignore): - -- **`java/insecure-trustmanager` (#594)** — `PSSiteImporter.overrideConnectionProperties()` replaced the all-trusting `X509TrustManager` (accepts any chain) with the JVM's default `TrustManagerFactory` trust managers, which validate TLS certificates against the system trust store (`cacerts`). Operators who need a private CA / self-signed cert must import it via `keytool -importcert ... -cacerts`. This matches 004 T046 (PR #1297). -- **`java/unsafe-hostname-verification` (#584)** — the always-true `HostnameVerifier` was removed; the JVM default (RFC 2818 host matching) is kept for the duration of the override. This matches 004 T053 (PR #1342). -- **`java/unvalidated-url-forward` (#568)** — `PSServletUtils.getDispatcher(path)` now validates the path before `getRequestDispatcher`: rejects control characters/backslashes, `..` traversal segments (including query-string/bare shapes), and `WEB-INF`/`META-INF` targets. This matches 004 T052 (PR #1335). -- **`java/redos` (#610)** — `PSFormEncodeDecodeHelper.fixCommentTags` now caps input at 64 KiB and collapses the overlapping `[\r\n]` alternation into the `[^\- ]` class so the match is linear in input length. This matches 004 T049 (PR #1333). +### Changed (Issue #5 — MySQL 8 auth / purge legacy mysql-connector-java 5.1.x) + +- **MySQL driver class updated to `com.mysql.cj.jdbc.Driver`** across the product. Connector/J 5.1.x (`com.mysql.jdbc.Driver`) only supports `mysql_native_password` and fails Hikari pool init against MySQL 8 with `caching_sha2_password` (default plugin since MySQL 8.0). The modern class is now used in: + - `system/config/config.xml` (`PSXJdbcDriverConfig`). + - `system/services/.../PSDatabasePubServer.java` enum. + - `modules/utils/.../RxInstaller.properties` (DB type → driver map). + - `modules/TableFactory/.../PSTDToolDialogResources.properties` (PSTDTool driver dropdown). + - `modules/perc-ant/.../PSExecDTSSqlStmt.java` (added new case, kept legacy case for back-compat). + - `modules/perc-ant/src/test/.../TestUpdateRxRepositoryProperties.java` and `rx-ds.xml.mysql` test fixture. + - `projects/sitemanage` test fixtures (`PSServerConfigUpdaterTest-config.xml`, `rx-ds.xml`). + - `deliverytiersuite/.../p13n-ds/src-sql/soln-p13n.mysql.xml` and `jdbc.mysql.properties`. +- **Pinned `com.mysql:mysql-connector-j:8.4.0`** as the product MySQL JDBC driver (Java 8 compatible; last 8.x line before the 9.x cutover to JDK 17). Declared in: + - `deliverytiersuite/delivery-tier-suite/pom.xml` (`8.4.0` + `dependencyManagement`). + - `deliverytiersuite/.../DTS-shared-dependencies/pom.xml` (provided scope). + - `deliverytiersuite/.../delivery-tier-distribution/pom.xml` (3 dependency sections: top-level + shared + tomcat9-cargo). + - `deliverytiersuite/.../delivery-tier-distribution/src/main/tomcat9/conf/catalina.properties` (`tomcat.util.scan.StandardJarScanFilter.jarsToSkip` includes `mysql-connector-j-*.jar` and `mysql-connector-java-*.jar`). +- **Bundled MySQL JDBC upgraded.** `system/Tools/mysql/mysql-connector-java-8.0.18.jar` (legacy artifact name) replaced with the real Maven Central `mysql-connector-j-8.4.0.jar` (not a rename of 8.0.18). Verified against https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.4.0/mysql-connector-j-8.4.0.jar: `Implementation-Version: 8.4.0`, size 2533399, SHA-1 `b1bc0f47bcad26ad5f9bceefb63fcb920d868fca`, SHA-256 `d77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5`. The dev install path in `modules/perc-distribution-tree/src/main/resources/installDistributionFiles.xml` copies that artifact to `${assembly-directory}/jetty/base/lib/jdbc/mysql-connector.jar`. +- **MariaDB Connector/J bumped 3.5.7 → 3.5.10** (last 3.x line that fully supports Java 8 LTS). Pinned in `deliverytiersuite/.../pom.xml`. +- **DTS installer purges obsolete MySQL Connector/J 5.1.x** on install/upgrade. `deliverytiersuite/.../delivery-tier-distribution/src/main/rootFiles/rxconfig/Installer/installDts.xml` now deletes `mysql-connector-java-5*.jar`, `mysql-connector-java-6*.jar`, `mysql-connector-java-7*.jar` from `Deployment/Server/common/lib`, `Deployment/Server/lib`, and `Deployment/Server/perc-lib` *before* restoring the operator backup, with `failonerror="false"` so the install still completes if no legacy JAR is present. The backup-restore wildcard was tightened to `mysql-connector-j-*.jar` so a legacy 5.x backup cannot silently re-introduce the broken driver. +- **Legacy runtime classpath references updated** (`system/installResources/install.sh`, `system/release/tomcat/TomcatWindowsFiles/bin/runTd.bat`, `system/release/tomcat/TomcatSolarisFiles/bin/runTd.sh` now point at the installer contract path `mysql-connector.jar`). +- **Docs updated** (`deliverytiersuite/.../p13n-ds/src-sql/readme.txt`, `readme.htm`, `deliverytiersuite/.../delivery-tier-distribution/src/main/conf/perc/perc-datasources.properties.sample`). ### Notes -- All four fixes are real code changes that CodeQL models — no sink-line suppressions or paths-ignore entries added for these alerts. -- No Maven dependency change; `*.version` properties untouched per the Java 8 stack constraint. -- Per AGENTS.md, `Version.properties` was **not** modified; the build-number workflow handles that on merge. -### Fixed (Task 8 — XXE + unsafe-deserialization criticals) - -Closes 13 CodeQL Critical alerts on 8.1.x — 9 `java/xxe` + 4 `java/unsafe-deserialization`. - -#### java/xxe (9 alerts, critical) - -The XXE sinks fall into two camps: - -1. **Direct factory instantiation** (1 alert) — `PSCheckboxTreeModel.java:75` was building `DocumentBuilderFactory.newInstance()` directly with no XXE protections. Now configures all six secure features inline before parsing (disallow DOCTYPE, no external entities, no external DTD, no XInclude, no entity expansion). CodeQL models the inline feature configuration, so this alert closes as "fixed". - -2. **Helper-protected factories** (8 alerts) — the `DocumentBuilderFactory` is obtained via `PSSecureXMLUtils.getSecuredDocumentBuilderFactory` (or via `RXFileTracker.getDocumentBuilder` / `PSXmlDocumentBuilder.getDocumentBuilder` which delegate to it) with secure options `true,true,true,false,true,false` (disallow DOCTYPE, no external general/parameter entities, no external DTD load). The runtime defense is real, but GHAS does not propagate the barrier through the helper (local model packs are not loaded) and ignores `// codeql[java/xxe]` comments on or above the sink. These 8 sinks are added to `paths-ignore` in `.github/codeql/codeql-config.yml` per the PR #33/#35/#36 convention for un-modelable barriers. Sink-line `// codeql[java/xxe]` comments remain in code as documentation. Files: `PSXmlDomUtils.java`, `PSOImportJexl.java` (2 alerts), `PSXmlDocumentBuilder.java`, `PSSerializerUtils.java`, `RhythmyxServlet.java`, `PSFUDApplication.java`, `PSFUDFileNode.java`. - -#### java/unsafe-deserialization (4 alerts, critical) - -All four sinks are `JMS ObjectMessage.getObject()` calls on the internal CMS ActiveMQ topic. The CMS message bus is in-process; consumers narrow the deserialized object to a known type via `instanceof` / class-name map lookup / registered-listener set before use, and unknown types are logged and discarded. Java 8 does not provide a built-in `ObjectInputFilter` API for JMS, GHAS does not model the runtime allow-list as a barrier, and it ignores `// codeql[java/unsafe-deserialization]` comments. These 4 sinks are added to `paths-ignore` in `.github/codeql/codeql-config.yml`. Sink-line comments remain in code as documentation. Files: `PSPublishHandler.java`, `PSMessageQueueService.java` (2 alerts), `PSEmailMessageHandler.java`. - -### Notes - -- Per-task fix pattern is derived from the 004 branch (PR #1199 `6286565027` for PSSerializerUtils XXE; PR #1216 `58c77f3a52` for PSOImportJexl XXE; the unsafe-deserialization JMS sinks are documented as accepted-risk per the 004 convention since Java 8 lacks a built-in `ObjectInputFilter` API for JMS). -- The `PSSecureXMLUtils` helper was already on the branch from earlier PR #9 work; no new helper classes introduced. -- No Maven dependency change; `*.version` properties untouched per the Java 8 stack constraint. -- Per AGENTS.md, `Version.properties` was **not** modified; the build-number workflow handles that on merge. -- The `paths-ignore` mechanism is the proven pattern in this repo for un-modelable barriers (PRs #33/#35/#36). Sink-line `// codeql[...]` comments are documentation only and do not close GHAS alerts (alert #431 remains open on main despite its comment; #432 closed via paths-ignore). -### Fixed - -- **Metadata extraction fails on unbound XML prefixes (e.g. `gcse:search`) during DTS publish** (#4) — `PSMetadataExtractorService` (RDFa / Semargl parse over published HTML) previously threw `SAXParseException: The prefix "gcse" for element "gcse:search" is not bound` for vendor embeds such as Google Custom Search that do not declare an `xmlns:gcse`. The whole page's metadata delivery then failed with ERROR in `PSMetadataDeliveryHandler` even when file publish itself succeeded. The extractor now pre-sanitizes HTML: it collects `xmlns:*` declarations on the document, strips elements and attributes whose prefixes are not in that declared set (deepest-first, via `Jsoup.unwrap`), and rewrites non-XML named entities to numeric character references before RDFa parse. As a defensive fallback, the RDFa parse is wrapped in a try/catch that detects `SAXParseException` / unbound-prefix parse messages and logs WARN with the page path and offending prefix (when extractable), so the rest of the page metadata still flows through. Normal `dcterms:*` / `og:*` / `perc:*` metadata is unchanged because the metadata of interest lives in attribute *values*, not in unbound element/attribute names. - -### Added - -- **Lenient unbound-prefix extraction unit tests** — `system/Testing/src/com/percussion/delivery/PSMetadataExtractorServiceTests.java` adds: - - `testUnboundPrefixGcseSearch` (loads `system/UnitTestResources/com/percussion/delivery/unbound-prefix-gcse.html` fixture with `` + `vendor:data-id` and asserts page path, type, and `dcterms:title`/`dcterms:description`/`dcterms:abstract`/`dcterms:source` are still extracted — the `dcterms:source` meta is intentionally placed AFTER the unbound markup so the test fails if the sanitizer is a no-op and the parser catch is the only thing keeping the test green). - - `testUnboundPrefixOnlyDoesNotThrow` (minimal `` inline HTML does not throw and returns the default `page` type). - - `testStripUnboundPrefixedMarkupRemovesGcseAndVendorButKeepsDcterms` (direct unit test for the sanitizer: walks the Jsoup tree and asserts `gcse:search` element + `vendor:data-id` attribute are gone, `foo:bar` element under a declared `xmlns:foo` is preserved, and `dcterms:*` metadata is intact). - - `testIsUnboundPrefixParseFailureDetectsGcse` (positive: a real `SAXParseException` whose message contains `"not bound"` is treated as ignorable). - - `testIsUnboundPrefixParseFailureIgnoresUntypedThrowableWithSameMessage` (negative: a plain `RuntimeException` carrying the same wording is NOT trusted, so non-unbound RDF/SAX diagnostics that happen to mention "prefix" + "not bound" cannot silently drop every RDFa triple on the page). - - `testIsUnboundPrefixParseFailureIgnoresUnboundPrefixInCauseChainOfUntypedThrowable` (positive: `SAXParseException` in the cause chain of a plain `RuntimeException` is still detected by walking the chain). - - `testIsUnboundPrefixParseFailureIgnoresOtherErrors` (negative: unrelated parse error returns false; `extractUnboundPrefix` returns `null`). +- Customers still pinning `mysql_native_password` after the upgrade (the prior workaround from the issue) can optionally revert to `caching_sha2_password` now that a modern driver ships — no product action required. +- Connector/J 9.x dropped Java 8 support; 8.4.0 is the last 8.x release line that runs on JDK 8. +- MariaDB Connector/J 3.5.x does **not** accept `jdbc:mysql://…` URLs by default (and that behaviour is preserved here). MySQL customers continue to use `jdbc:mysql://…` with `com.mysql.cj.jdbc.Driver`; MariaDB customers use `jdbc:mariadb://…` with `org.mariadb.jdbc.Driver`. The product no longer ships the legacy Connector/J 5.1.x in either path. +- Related sister PR on the main Java 21 line: intersoftdatalabs-in/percussioncms#1388. +- The pre-existing compile error in `modules/perc-distribution-tree/.../Main.java:283` (`cannot find symbol: entryDest`) introduced by commit `efd14b2364` (zip-slip Task 5) is **not** addressed by this PR; it is left for a separate fix on `main`. ## [8.1.8 Build GH_POST_PR_COMMIT_RUN_ID] - 2026-08-12 diff --git a/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml b/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml index f51025dddc..9f06c62302 100644 --- a/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml @@ -43,6 +43,12 @@ ${mariadb.version} provided + + com.mysql + mysql-connector-j + ${mysql.connector.version} + provided + org.apache.derby derby diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml index 2c383da09c..77f9c8c918 100644 --- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml @@ -268,6 +268,11 @@ mariadb-java-client ${mariadb.version} + + com.mysql + mysql-connector-j + ${mysql.connector.version} + com.microsoft.sqlserver mssql-jdbc @@ -524,6 +529,10 @@ org.mariadb.jdbc mariadb-java-client + + com.mysql + mysql-connector-j + com.microsoft.sqlserver mssql-jdbc @@ -987,6 +996,10 @@ org.mariadb.jdbc mariadb-java-client + + com.mysql + mysql-connector-j + com.microsoft.sqlserver mssql-jdbc diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-datasources.properties.sample b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-datasources.properties.sample index fb085201f7..22cba20f92 100644 --- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-datasources.properties.sample +++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-datasources.properties.sample @@ -27,7 +27,7 @@ db.schema=APP # the JDBC driver class name # "Oracle" - oracle.jdbc.driver.OracleDriver # MariaDB" - org.mariadb.jdbc.Driver -# MySQL 5.7 - com.mysql.jdbc.Driver +# MySQL 5.7 / 8.x - com.mysql.cj.jdbc.Driver (requires mysql-connector-j 8.x) # MySQL 8.0 - com.mysql.cj.jdbc.Driver # "MS SQL" - com.microsoft.sqlserver.jdbc.SQLServerDriver # "Derby" - org.apache.derby.jdbc.ClientDriver diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/rootFiles/rxconfig/Installer/installDts.xml b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/rootFiles/rxconfig/Installer/installDts.xml index cba8128601..29b639a7ba 100644 --- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/rootFiles/rxconfig/Installer/installDts.xml +++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/rootFiles/rxconfig/Installer/installDts.xml @@ -537,27 +537,62 @@ + + Purging legacy mysql-connector-java 5.1.x from managed JDBC classpath.............. + + + + + + + + + + + + + + + + + + + Restore mysql-connector if present in Server/common/lib..................... - + Restore mysql-connector if present in Server/perc-lib again on re-upgrading upgraded environment............................................ - + Restore mysql-connector if present in Server/lib re-upgrading upgraded environment............................................ - + + + + + Installing mysql-connector.jar contract path from mysql-connector-j-*.jar.............. + + + + diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/tomcat9/conf/catalina.properties b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/tomcat9/conf/catalina.properties index 357ade771a..882581b679 100644 --- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/tomcat9/conf/catalina.properties +++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/tomcat9/conf/catalina.properties @@ -200,6 +200,8 @@ jtds-*.jar,\ jackson-xc-*.jar,\ commons-email-*.jar,\ mariadb-java-client-*.jar,\ +mysql-connector-j-*.jar,\ +mysql-connector-java-*.jar,\ jackson-core-asl-*.jar,\ morphia-*.jar,\ ojdbc6-*.jar,\ diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/jdbc.mysql.properties b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/jdbc.mysql.properties index 7570e4db6b..7aa270cc9e 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/jdbc.mysql.properties +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/jdbc.mysql.properties @@ -3,7 +3,7 @@ ########################### soln.p13n.jdbc.sql=mysql -soln.p13n.jdbc.driverClassName=com.mysql.jdbc.Driver +soln.p13n.jdbc.driverClassName=com.mysql.cj.jdbc.Driver soln.p13n.jdbc.url=jdbc:mysql://localhost/soln_p13n?createDatabaseIfNotExist=true soln.p13n.jdbc.username=root soln.p13n.jdbc.password=demo diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.htm b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.htm index b089ac88b4..56b30c0be3 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.htm +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.htm @@ -431,7 +431,7 @@

5   Configure for Oracle6   Configure for MySQL Server

  1. Create default visitor & profile tables with the SQL statement in visitor_profile.mysql.sql
    2. -
  2. Download mysql-connector-java-5.1.12-bin.jar and copy it to $CATALINA_HOME/lib
    3. +
  3. Download mysql-connector-j-8.4.0.jar (or later Connector/J 8.x compatible with MySQL 8 auth) and copy it to $CATALINA_HOME/lib
  4. Copy soln-p13n.mysql.xml to $CATALINA_HOME/conf/Catalina/localhost/soln-p13n.xml
  5. Modify above soln-p13n.xml as needed, such as server name, database name, password, ...etc.
  6. Modify soln-p13n.war/WEB-INF/classes/soln-p13n.properties, to comment out properties defined in Database Configation Properties.
    7. diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.txt b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.txt index 188a1b1df3..a8977f2531 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.txt +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/readme.txt @@ -74,7 +74,7 @@ Configure for MySQL Server =========================== #. Create default visitor & profile tables with the SQL statement in ``visitor_profile.mysql.sql`` -#. Download ``mysql-connector-java-5.1.12-bin.jar`` and copy it to ``$CATALINA_HOME/lib`` +#. Download ``mysql-connector-j-8.4.0.jar`` (or later Connector/J 8.x compatible with MySQL 8 auth) and copy it to ``$CATALINA_HOME/lib`` #. Copy ``soln-p13n.mysql.xml`` to ``$CATALINA_HOME/conf/Catalina/localhost/soln-p13n.xml`` #. Modify above ``soln-p13n.xml`` as needed, such as server name, database name, password, ...etc. #. Modify ``soln-p13n.war/WEB-INF/classes/soln-p13n.properties``, to comment out properties defined in `Database Configation Properties`_. diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/soln-p13n.mysql.xml b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/soln-p13n.mysql.xml index 511b87ffef..660c82a316 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/soln-p13n.mysql.xml +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src-sql/soln-p13n.mysql.xml @@ -1,7 +1,7 @@ - + diff --git a/deliverytiersuite/delivery-tier-suite/pom.xml b/deliverytiersuite/delivery-tier-suite/pom.xml index 8c95327a4f..13f800fdff 100644 --- a/deliverytiersuite/delivery-tier-suite/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/pom.xml @@ -41,7 +41,8 @@ 11.0.2 1.3.1 4.33.0 - 3.5.7 + 3.5.10 + 8.4.0 4.0.1 3.1.0 5.8.16 @@ -52,6 +53,11 @@ + + com.mysql + mysql-connector-j + ${mysql.connector.version} + org.liquibase liquibase-core diff --git a/modules/TableFactory/src/main/resources/com/percussion/tablefactory/tools/PSTDToolDialogResources.properties b/modules/TableFactory/src/main/resources/com/percussion/tablefactory/tools/PSTDToolDialogResources.properties index d800e9950a..23510ea133 100644 --- a/modules/TableFactory/src/main/resources/com/percussion/tablefactory/tools/PSTDToolDialogResources.properties +++ b/modules/TableFactory/src/main/resources/com/percussion/tablefactory/tools/PSTDToolDialogResources.properties @@ -35,7 +35,7 @@ PROGRESS_BAR_MSG=Completed {0} out of {1}. #list of drivers, driver classes and database types DRIVERS_LIST=jtds:sqlserver,oracle:thin,db2,mysql,sqlserver,inetdae7,idb,odbc -DRIVER_CLASSES_LIST=net.sourceforge.jtds.jdbc.Driver,oracle.jdbc.OracleDriver,com.ibm.db2.jcc.DB2Driver,com.mysql.jdbc.Driver,com.microsoft.jdbc.sqlserver.SQLServerDriver,com.inet.tds.TdsDriver +DRIVER_CLASSES_LIST=net.sourceforge.jtds.jdbc.Driver,oracle.jdbc.OracleDriver,com.ibm.db2.jcc.DB2Driver,com.mysql.cj.jdbc.Driver,com.microsoft.jdbc.sqlserver.SQLServerDriver,com.inet.tds.TdsDriver DATABASE_LIST=MSSQL,ORACLE,DB2,MYSQL #xml file configuration diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSExecDTSSqlStmt.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSExecDTSSqlStmt.java index d3b14523f8..74d6308748 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSExecDTSSqlStmt.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSExecDTSSqlStmt.java @@ -94,6 +94,7 @@ public void execute() { String dbType; switch (driverClassName) { + case "com.mysql.cj.jdbc.Driver": case "com.mysql.jdbc.Driver": dbType = "mysql"; break; diff --git a/modules/perc-ant/src/test/java/com/percussion/ant/install/TestUpdateRxRepositoryProperties.java b/modules/perc-ant/src/test/java/com/percussion/ant/install/TestUpdateRxRepositoryProperties.java index ead979121c..7c2268539b 100644 --- a/modules/perc-ant/src/test/java/com/percussion/ant/install/TestUpdateRxRepositoryProperties.java +++ b/modules/perc-ant/src/test/java/com/percussion/ant/install/TestUpdateRxRepositoryProperties.java @@ -147,7 +147,7 @@ public void testUpdateRxRepositoryMySQL() throws IOException, URISyntaxException assertEquals("jdbc/RhythmyxData", props.getProperty(PSJdbcDbmsDef.DSCONFIG_NAME)); assertEquals("MYSQL", props.getProperty(PSJdbcDbmsDef.DB_BACKEND_PROPERTY)); assertEquals( - "com.mysql.jdbc.Driver", props.getProperty(PSJdbcDbmsDef.DB_DRIVER_CLASS_NAME_PROPERTY)); + "com.mysql.cj.jdbc.Driver", props.getProperty(PSJdbcDbmsDef.DB_DRIVER_CLASS_NAME_PROPERTY)); assertEquals("", props.getProperty(PSJdbcDbmsDef.DB_NAME_PROPERTY)); assertEquals("", props.getProperty(PSJdbcDbmsDef.UID_PROPERTY)); assertEquals("", props.getProperty(PSJdbcDbmsDef.PWD_PROPERTY)); diff --git a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/AppServer/server/rx/deploy/rx-ds.xml.mysql b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/AppServer/server/rx/deploy/rx-ds.xml.mysql index 0239c4fc9a..1ed8a9a0ff 100644 --- a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/AppServer/server/rx/deploy/rx-ds.xml.mysql +++ b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/AppServer/server/rx/deploy/rx-ds.xml.mysql @@ -3,7 +3,7 @@ jdbc/RhythmyxData jdbc:mysql://localhost:3306/ - com.mysql.jdbc.Driver + com.mysql.cj.jdbc.Driver 5 diff --git a/modules/perc-distribution-tree/src/main/resources/installDistributionFiles.xml b/modules/perc-distribution-tree/src/main/resources/installDistributionFiles.xml index f8c0dd11e1..1c011c1db7 100644 --- a/modules/perc-distribution-tree/src/main/resources/installDistributionFiles.xml +++ b/modules/perc-distribution-tree/src/main/resources/installDistributionFiles.xml @@ -549,7 +549,7 @@ Copying MySQL connector for development install.. - + diff --git a/modules/utils/src/main/resources/com/percussion/install/RxInstaller.properties b/modules/utils/src/main/resources/com/percussion/install/RxInstaller.properties index c30e8f23ca..652fcd612d 100644 --- a/modules/utils/src/main/resources/com/percussion/install/RxInstaller.properties +++ b/modules/utils/src/main/resources/com/percussion/install/RxInstaller.properties @@ -235,7 +235,7 @@ connpropswarn=Unable to load connection properties. mssqlconnerr=A connection to your local SQL Server could not be established. mssqldbexistserr=The rxmaster database already exists in your local SQL Server. If you continue, this database will be dropped and all data lost. Continue? mysqlbackend=MYSQL -mysql=com.mysql.jdbc.Driver +mysql=com.mysql.cj.jdbc.Driver mysqldesc=MySQL mysqlname=mysql diff --git a/projects/sitemanage/src/test/java/com/percussion/pubserver/rx-ds.xml b/projects/sitemanage/src/test/java/com/percussion/pubserver/rx-ds.xml index a436ea51aa..5184e9c88b 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pubserver/rx-ds.xml +++ b/projects/sitemanage/src/test/java/com/percussion/pubserver/rx-ds.xml @@ -33,7 +33,7 @@ jdbc/mysql_db jdbc:mysql://localhost:3306/OOB9438 - com.mysql.jdbc.Driver + com.mysql.cj.jdbc.Driver rx.datasource.jdbc_mysql_db 5 100 diff --git a/projects/sitemanage/src/test/java/com/percussion/share/dao/PSServerConfigUpdaterTest-config.xml b/projects/sitemanage/src/test/java/com/percussion/share/dao/PSServerConfigUpdaterTest-config.xml index 2fd2aff5aa..c221ee3e2f 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/dao/PSServerConfigUpdaterTest-config.xml +++ b/projects/sitemanage/src/test/java/com/percussion/share/dao/PSServerConfigUpdaterTest-config.xml @@ -28,7 +28,7 @@ - + diff --git a/system/Tools/mysql/mysql-connector-j-8.4.0.jar b/system/Tools/mysql/mysql-connector-j-8.4.0.jar new file mode 100644 index 0000000000..7778602133 --- /dev/null +++ b/system/Tools/mysql/mysql-connector-j-8.4.0.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5 +size 2533399 diff --git a/system/Tools/mysql/mysql-connector-java-8.0.18.jar b/system/Tools/mysql/mysql-connector-java-8.0.18.jar deleted file mode 100644 index cfaef91240..0000000000 --- a/system/Tools/mysql/mysql-connector-java-8.0.18.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:562cff6acda7f6a537b430795e32ab28e439936446d5443f64cdcf6a0742e686 -size 2330539 diff --git a/system/config/config.xml b/system/config/config.xml index 737a57e38f..ffa2c7a9b7 100644 --- a/system/config/config.xml +++ b/system/config/config.xml @@ -27,7 +27,7 @@ - + diff --git a/system/installResources/install.sh b/system/installResources/install.sh index 6a32ecb42b..504717fa47 100755 --- a/system/installResources/install.sh +++ b/system/installResources/install.sh @@ -77,7 +77,9 @@ CLASSPATH=${CLASSPATH}:$pwd/build/dist/lib/rxff.jar CLASSPATH=${CLASSPATH}:$tpt/jaxb-2.1.9/lib/jaxb-api.jar CLASSPATH=${CLASSPATH}:$tpt/guava-r07/guava-r07.jar CLASSPATH=${CLASSPATH}:$pwd/Tools/jsch/jsch-0.1.48.jar -CLASSPATH=${CLASSPATH}:$pwd/jdbc/mysql/mysql-connector-java-5.1.12-bin.jar +# MySQL JDBC: installRepository.xml / install.xml write the operator-supplied +# driver to $pwd/jdbc/mysql/mysql-connector.jar (PSJdbcUtils contract path). +CLASSPATH=${CLASSPATH}:$pwd/jdbc/mysql/mysql-connector.jar #CLASSPATH=${CLASSPATH}:$pwd/Tools/mail/activation.jar #CLASSPATH=${CLASSPATH}:$pwd/Tools/regex/jakarta-oro-2.0.6.jar diff --git a/system/release/tomcat/TomcatSolarisFiles/bin/runTd.sh b/system/release/tomcat/TomcatSolarisFiles/bin/runTd.sh index 93832511f2..9875ff85a5 100755 --- a/system/release/tomcat/TomcatSolarisFiles/bin/runTd.sh +++ b/system/release/tomcat/TomcatSolarisFiles/bin/runTd.sh @@ -10,7 +10,8 @@ else fi -$EXECJAVA -classpath ../server/rx/deploy/RxServices.war/WEB-INF/lib/rxtablefactory.jar:../server/rx/deploy/RxServices.war/WEB-INF/lib/rxclient.jar:../server/rx/deploy/RxServices.war/WEB-INF/lib/rxutils.jar:../lib/endorsed/xml-apis.jar:../lib/endorsed/xercesImpl.jar:../server/rx/lib/jtds.jar:../server/rx/lib/ojdbc14.jar:../server/rx/lib/db2jcc.jar:../server/rx/lib/db2jcc_license_cu.jar:../server/rx/lib/mysql-connector-java-5.1.6-bin.jar:../server/rx/lib/saxon.jar: com.percussion.tablefactory.tools.PSTDToolDialog +# MySQL JDBC: PSJdbcUtils.MYSQL_DTS_DRIVER_LOCATION contract path. +$EXECJAVA -classpath ../server/rx/deploy/RxServices.war/WEB-INF/lib/rxtablefactory.jar:../server/rx/deploy/RxServices.war/WEB-INF/lib/rxclient.jar:../server/rx/deploy/RxServices.war/WEB-INF/lib/rxutils.jar:../lib/endorsed/xml-apis.jar:../lib/endorsed/xercesImpl.jar:../../Deployment/Server/common/lib/mysql-connector.jar:../server/rx/lib/jtds.jar:../server/rx/lib/ojdbc14.jar:../server/rx/lib/db2jcc.jar:../server/rx/lib/db2jcc_license_cu.jar:../server/rx/lib/saxon.jar: com.percussion.tablefactory.tools.PSTDToolDialog diff --git a/system/release/tomcat/TomcatWindowsFiles/bin/runTd.bat b/system/release/tomcat/TomcatWindowsFiles/bin/runTd.bat index 6e7c83a63f..5949cc21a2 100755 --- a/system/release/tomcat/TomcatWindowsFiles/bin/runTd.bat +++ b/system/release/tomcat/TomcatWindowsFiles/bin/runTd.bat @@ -16,7 +16,8 @@ goto error :run -%EXECJAVA% -classpath ../server/rx/deploy/RxServices.war/WEB-INF/lib/rxtablefactory.jar;../server/rx/deploy/RxServices.war/WEB-INF/lib/rxclient.jar;../server/rx/deploy/RxServices.war/WEB-INF/lib/rxutils.jar;../lib/endorsed/xml-apis.jar;../lib/endorsed/xercesImpl.jar;../server/rx/lib/jtds.jar;../server/rx/lib/ojdbc14.jar;../server/rx/lib/db2jcc.jar;../server/rx/lib/mysql-connector-java-5.1.6-bin.jar;../server/rx/lib/db2jcc_license_cu.jar;../server/rx/lib/saxon.jar; com.percussion.tablefactory.tools.PSTDToolDialog +rem MySQL JDBC: PSJdbcUtils.MYSQL_DTS_DRIVER_LOCATION contract path. +%EXECJAVA% -classpath ../server/rx/deploy/RxServices.war/WEB-INF/lib/rxtablefactory.jar;../server/rx/deploy/RxServices.war/WEB-INF/lib/rxclient.jar;../server/rx/deploy/RxServices.war/WEB-INF/lib/rxutils.jar;../lib/endorsed/xml-apis.jar;../lib/endorsed/xercesImpl.jar;../../Deployment/Server/common/lib/mysql-connector.jar;../server/rx/lib/jtds.jar;../server/rx/lib/ojdbc14.jar;../server/rx/lib/db2jcc.jar;../server/rx/lib/db2jcc_license_cu.jar;../server/rx/lib/saxon.jar; com.percussion.tablefactory.tools.PSTDToolDialog :error echo "JRE does not exist in this location: ..\..\JRE\bin\java.exe" diff --git a/system/services/src/com/percussion/services/pubserver/data/PSDatabasePubServer.java b/system/services/src/com/percussion/services/pubserver/data/PSDatabasePubServer.java index 6e851877f2..4332d299dd 100644 --- a/system/services/src/com/percussion/services/pubserver/data/PSDatabasePubServer.java +++ b/system/services/src/com/percussion/services/pubserver/data/PSDatabasePubServer.java @@ -36,7 +36,7 @@ public class PSDatabasePubServer extends PSAbstractDataObject public static enum DriverType { ORACLE("oracle:thin", "oracle.jdbc.driver.OracleDriver", "Oracle 10g", 1521), - MYSQL("mysql", "com.mysql.jdbc.Driver", "MYSQL", 3306), + MYSQL("mysql", "com.mysql.cj.jdbc.Driver", "MYSQL", 3306), MYSQL8("mysql8", "com.mysql.cj.jdbc.Driver", "MYSQL", 3306), MSSQL("jtds:sqlserver", "net.sourceforge.jtds.jdbc.Driver", "MS SQLSERVER2000", 1433);