You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/11/08 07:43:30 UTC
[syncope] branch 2_1_X updated: Upgrading jQuery UI,
Swagger UI and ANTLR
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 6bd5f91 Upgrading jQuery UI, Swagger UI and ANTLR
6bd5f91 is described below
commit 6bd5f9141c734f80830d4878e48fda7ab0a7b3c9
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 8 08:43:16 2021 +0100
Upgrading jQuery UI, Swagger UI and ANTLR
---
core/rest-cxf/pom.xml | 4 ----
core/rest-cxf/src/main/resources/wadl2html/index.xsl | 2 +-
pom.xml | 11 +++--------
src/site/xdoc/release-process.xml | 3 +--
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 964308d..78b3cc0 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -127,10 +127,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.webjars</groupId>
- <artifactId>jquery-ui-themes</artifactId>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
<artifactId>highlightjs</artifactId>
</dependency>
diff --git a/core/rest-cxf/src/main/resources/wadl2html/index.xsl b/core/rest-cxf/src/main/resources/wadl2html/index.xsl
index e13ac2d..b1c6fb7 100644
--- a/core/rest-cxf/src/main/resources/wadl2html/index.xsl
+++ b/core/rest-cxf/src/main/resources/wadl2html/index.xsl
@@ -46,7 +46,7 @@
<xsl:value-of select="wadl:doc/@title"/>
</title>
- <link rel="stylesheet" href="{$contextPath}/webjars/jquery-ui-themes/${jquery-ui.version}/smoothness/jquery-ui.min.css"/>
+ <link rel="stylesheet" href="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.min.css"/>
<style>
body {
font-family: "Verdana,Arial,sans-serif";
diff --git a/pom.xml b/pom.xml
index 69b8a70..5ed5bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,11 +459,11 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<swagger-core.version>2.0.10</swagger-core.version>
- <swagger-ui.version>3.52.5</swagger-ui.version>
+ <swagger-ui.version>4.0.1</swagger-ui.version>
<guava.version>29.0-jre</guava.version>
<jquery.version>3.4.1</jquery.version>
- <jquery-ui.version>1.12.1</jquery-ui.version>
+ <jquery-ui.version>1.13.0</jquery-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -506,7 +506,7 @@ under the License.
<tycho.version>1.7.0</tycho.version>
<netbeans.version>RELEASE125</netbeans.version>
- <antlr4.version>4.9.2</antlr4.version>
+ <antlr4.version>4.9.3</antlr4.version>
<hotswap.version>1.4.1</hotswap.version>
@@ -1447,11 +1447,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.webjars</groupId>
- <artifactId>jquery-ui-themes</artifactId>
- <version>${jquery-ui.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
<artifactId>jQuery-slimScroll</artifactId>
<version>${jquery-slimscroll.version}</version>
</dependency>
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index 02f207a..4214717 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -317,8 +317,7 @@ curl -o /tmp/syncope.wadl http://localhost:9080/syncope/syncope.wadl
curl -o /tmp/index.html http://localhost:9080/syncope/index.html
sed -i 's/\/syncope\/webjars\/jquery\/3.4.1\/jquery.min.js/https:\/\/code.jquery.com\/jquery-3.4.1.min.js/' /tmp/index.html
-sed -i 's/\/syncope\/webjars\/jquery-ui\/1.12.1\/jquery-ui.min.js/https:\/\/code.jquery.com\/ui\/1.12.1\/jquery-ui.min.js/' /tmp/index.html
-sed -i 's/\/syncope\/webjars\/jquery-ui-themes\/1.12.1\/smoothness\/jquery-ui.min.css/https:\/\/code.jquery.com\/ui\/1.12.1\/themes\/smoothness\/jquery-ui.css/' /tmp/index.html
+sed -i 's/\/syncope\/webjars\/jquery-ui\/1.13.0\/jquery-ui.min.js/https:\/\/code.jquery.com\/ui\/1.13.0\/jquery-ui.min.js/' /tmp/index.html
# if releasing from 2_0_X
curl -o /tmp/schema_1_syncope2.html http://localhost:9080/syncope/schema_1_syncope2.html