You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/11/15 19:25:20 UTC
[jspwiki] branch master updated: Revert wro4j plugin and use jdk8 version of hsqldb
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 276bbbd Revert wro4j plugin and use jdk8 version of hsqldb
276bbbd is described below
commit 276bbbd806e10a5a1f8e89b728e57343a101a89f
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Mon Nov 15 20:24:48 2021 +0100
Revert wro4j plugin and use jdk8 version of hsqldb
this should fix Docker builds
---
jspwiki-it-tests/pom.xml | 2 ++
jspwiki-main/pom.xml | 18 ++++++++++--------
pom.xml | 4 +++-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 6dc678e..925c113 100644
--- a/jspwiki-it-tests/pom.xml
+++ b/jspwiki-it-tests/pom.xml
@@ -52,6 +52,7 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>provided</scope>
+ <classifier>jdk8</classifier>
</dependency>
<dependency>
@@ -263,6 +264,7 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
+ <classifier>jdk8</classifier>
</dependency>
</dependencies>
</plugin>
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 911db1d..906ad57 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -193,28 +193,30 @@
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all</artifactId>
<scope>test</scope>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
- <artifactId>sqltool</artifactId>
+ <artifactId>hsqldb</artifactId>
<scope>test</scope>
+ <classifier>jdk8</classifier>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
<scope>test</scope>
- <type>pom</type>
+ <classifier>jdk8</classifier>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index af93b41..2053021 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.1.0</tika.version>
<tomcat.version>9.0.54</tomcat.version>
- <wro4j.version>1.10.1</wro4j.version>
+ <wro4j.version>1.8.0</wro4j.version> <!-- 1.9.0 and above require JDK >= 9 to execute -->
<xmlrpc.version>2.0.1</xmlrpc.version>
<plugin.antrun.version>3.0.0</plugin.antrun.version>
@@ -400,12 +400,14 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
+ <classifier>jdk8</classifier>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>sqltool</artifactId>
<version>${hsqldb.version}</version>
+ <classifier>jdk8</classifier>
</dependency>
<dependency>