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 2019/07/21 10:24:41 UTC
[syncope] branch 2_1_X updated: Upgrading Jackson,
Highlight.js and JUnit
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 abb14c1 Upgrading Jackson, Highlight.js and JUnit
abb14c1 is described below
commit abb14c189e48e21b5a94e52eb2603a636fd26656
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun Jul 21 07:52:28 2019 +0200
Upgrading Jackson, Highlight.js and JUnit
---
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 8 ++++----
src/site/xdoc/release-process.xml | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index b12c0fa..2cc95f4 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -136,7 +136,7 @@ under the License.
<jar src="lib/httpclient-@{httpclient.version}.jar"/>
<jar src="lib/httpmime-@{httpclient.version}.jar"/>
<jar src="lib/httpcore-4.4.11.jar"/>
- <jar src="lib/jackson-databind-@{jackson.version}.1.jar"/>
+ <jar src="lib/jackson-databind-@{jackson.version}.jar"/>
<jar src="lib/jackson-core-@{jackson.version}.jar"/>
<jar src="lib/jackson-annotations-@{jackson.version}.jar"/>
<jar src="lib/jasypt-@{jasypt.version}.jar"/>
diff --git a/pom.xml b/pom.xml
index 8fd8e76..e77d071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,7 +391,7 @@ under the License.
<cxf.version>3.2.9</cxf.version>
- <jackson.version>2.9.9</jackson.version>
+ <jackson.version>2.10.0.pr1</jackson.version>
<spring.version>5.1.8.RELEASE</spring.version>
<spring-security.version>5.1.5.RELEASE</spring-security.version>
@@ -436,7 +436,7 @@ under the License.
<h2.version>1.4.199</h2.version>
- <junit.version>5.5.0</junit.version>
+ <junit.version>5.5.1</junit.version>
<conf.directory>${project.build.directory}/test-classes</conf.directory>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
@@ -459,7 +459,7 @@ under the License.
<font-awesome.version>4.7.0</font-awesome.version>
<font-awesome.filename>font-awesome.min.css</font-awesome.filename>
<ionicons.version>2.0.1</ionicons.version>
- <highlightjs.version>9.8.0</highlightjs.version>
+ <highlightjs.version>9.15.8</highlightjs.version>
<codemirror.version>5.45.0</codemirror.version>
<googlediffmatchpath.version>895a9512bb</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
@@ -853,7 +853,7 @@ under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}.1</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index d6f32dc..120207e 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -322,13 +322,13 @@ sed -i 's/\/syncope\/webjars\/jquery-ui-themes\/1.12.1\/smoothness\/jquery-ui.mi
# if releasing from 2_0_X
curl -o /tmp/schema_1_syncope2.html http://localhost:9080/syncope/schema_1_syncope2.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/styles\/default.min.css/' /tmp/schema_1_syncope2.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/highlight.min.js/' /tmp/schema_1_syncope2.html
+sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.8\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.8\/styles\/default.min.css/' /tmp/schema_1_syncope2.html
+sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.8\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.8\/highlight.min.js/' /tmp/schema_1_syncope2.html
# else if releasing from 2_1_X
curl -o /tmp/schema_1_syncope21.html http://localhost:9080/syncope/schema_1_syncope21.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/styles\/default.min.css/' /tmp/schema_1_syncope21.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/highlight.min.js/' /tmp/schema_1_syncope21.html
+sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.8\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.8\/styles\/default.min.css/' /tmp/schema_1_syncope21.html
+sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.8\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.8\/highlight.min.js/' /tmp/schema_1_syncope21.html
./bin/shutdown.sh && cd -