diff --git a/pom.xml b/pom.xml index 0a2b249f..2622ad1d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ se.alipsa ride - 1.2.10-SNAPSHOT + 1.2.10 jar Ride @@ -41,10 +41,10 @@ 3.5-beta76 - 6.1.0.202203080745-r - 2.4.0 - 18.0.1 - 3.0.4 + 6.2.0.202206071550-r + 2.4.1 + 18.0.2 + 3.0.6 @@ -260,14 +260,14 @@ org.jsoup jsoup - 1.15.1 + 1.15.2 org.webjars bootstrap - 5.1.3 + 5.2.0 @@ -293,7 +293,7 @@ jakarta.annotation jakarta.annotation-api - 2.1.0 + 2.1.1 @@ -427,12 +427,12 @@ org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 @@ -484,7 +484,7 @@ com.github.jsqlparser jsqlparser - 4.4 + 4.5 @@ -501,7 +501,7 @@ org.apache.groovy groovy-all - 4.0.3 + 4.0.4 pom @@ -526,19 +526,19 @@ io.github.classgraph classgraph - 4.8.147 + 4.8.149 com.github.spotbugs spotbugs-annotations - 4.7.0 + 4.7.1 org.junit.jupiter junit-jupiter - 5.8.2 + 5.9.0 test @@ -605,7 +605,7 @@ release.tag=${release.tag} org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.9.0 diff --git a/release.md b/release.md index 536e69a2..50eaeaea 100644 --- a/release.md +++ b/release.md @@ -79,17 +79,23 @@ In those cases just copy the native files to the lib dir, the startup script poi # Version Descriptions -### 1.2.10 +### 1.2.10, 2022-08-16 - Security workaround for xerces dependency in jdom2 (add a newer version explicitly) - Fix "Check version" by removing -jdk and .jdk part from version names in Semantic version compare - upgrade dependencies - - classgraph (4.8.145 -> 4.8.147) - - groovy (4.0.1 -> 4.0.3) + - classgraph (4.8.145 -> 4.8.149) + - groovy (4.0.1 -> 4.0.4) - nashorn (15.3 -> 15.4) - - javafx (18 -> 18.0.1) + - javafx (18 -> 18.0.2) - jsoup (1.14.3 -> 1.15.1) - jackson (2.13.2 -> 1.13.3) -- If adding a mssql connection and driver is missing and auto add to pom.xml + - jsqlparser (4.4 -> 4.5) + - tika (2.4.0 -> 2.4.1) + - jersey (3.0.4 -> 3.0.6) + - jsoup (1.15.1 -> 1.15.2) + - jgit (6.1.0.202203080745-r -> 6.2.0.202206071550-r) + +- If adding a mssql connection and driver is missing and auto add to pom.xml: check for existing microsoft dll to align versions of the artifactId with the ddl version. - fix issue #19, ctrl+enter runs the entire content. Change to the following behavior: - Run button: selected text or everything if nothing selected diff --git a/src/main/java/se/alipsa/ride/code/mdrtab/MdrUtil.java b/src/main/java/se/alipsa/ride/code/mdrtab/MdrUtil.java index ef3a1596..2887e38c 100644 --- a/src/main/java/se/alipsa/ride/code/mdrtab/MdrUtil.java +++ b/src/main/java/se/alipsa/ride/code/mdrtab/MdrUtil.java @@ -37,7 +37,7 @@ public class MdrUtil { private static final String HIGHLIGHT_JS_CSS_PATH = "highlightJs/default.css"; private static final String HIGHLIGHT_JS_SCRIPT_PATH = "highlightJs/highlight.pack.js"; - private static final String BOOTSTRAP_CSS_PATH = "META-INF/resources/webjars/bootstrap/5.1.3/css/bootstrap.css"; + private static final String BOOTSTRAP_CSS_PATH = "META-INF/resources/webjars/bootstrap/5.2.0/css/bootstrap.css"; private static final String HIGHLIGHT_JS_INIT = "\n\n"; // The highlightJs stuff is in the mdr package public static final String HIGHLIGHT_JS_CSS = "\n\n";