Skip to content

Commit

Permalink
upgrade dependencies; release 1.2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
per committed Aug 16, 2022
1 parent 221a54b commit fa1eb16
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 22 deletions.
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>se.alipsa</groupId>
<artifactId>ride</artifactId>
<version>1.2.10-SNAPSHOT</version>
<version>1.2.10</version>
<packaging>jar</packaging>

<name>Ride</name>
Expand Down Expand Up @@ -41,10 +41,10 @@
<renjin.version>3.5-beta76</renjin.version>
<!--renjin.version>3.5-dev</renjin.version-->
<!--jgit 6 and up requires java 11-->
<jgit.version>6.1.0.202203080745-r</jgit.version>
<tika.version>2.4.0</tika.version>
<javafx.version>18.0.1</javafx.version>
<jersey.version>3.0.4</jersey.version>
<jgit.version>6.2.0.202206071550-r</jgit.version>
<tika.version>2.4.1</tika.version>
<javafx.version>18.0.2</javafx.version>
<jersey.version>3.0.6</jersey.version>
</properties>

<repositories>
Expand Down Expand Up @@ -260,14 +260,14 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.1</version>
<version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<!-- version is hard-coded in the ViewTab, make sure to update if the version is changed
(and that it is aligned with munin) -->
<version>5.1.3</version>
<version>5.2.0</version>
</dependency>

<dependency>
Expand All @@ -293,7 +293,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -427,12 +427,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.2</version>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version>
<version>2.18.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -484,7 +484,7 @@
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>4.4</version>
<version>4.5</version>
</dependency>
<!-- Git integration Core Library -->
<dependency>
Expand All @@ -501,7 +501,7 @@
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>4.0.3</version>
<version>4.0.4</version>
<type>pom</type>
</dependency>
<!-- enable @Grab to work in groovy -->
Expand All @@ -526,19 +526,19 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.147</version>
<version>4.8.149</version>
</dependency>

<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.7.0</version>
<version>4.7.1</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version>
<version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -605,7 +605,7 @@ release.tag=${release.tag}
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>5.9.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
16 changes: 11 additions & 5 deletions release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/se/alipsa/ride/code/mdrtab/MdrUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<script>hljs.initHighlightingOnLoad();</script>\n";
// The highlightJs stuff is in the mdr package
public static final String HIGHLIGHT_JS_CSS = "\n<link rel='stylesheet' href='" + resourceUrlExternalForm(HIGHLIGHT_JS_CSS_PATH) + "'>\n";
Expand Down

0 comments on commit fa1eb16

Please sign in to comment.