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 2015/03/27 15:15:19 UTC
[2/3] syncope git commit: Upgrading SLF4J, Jackson databind,
maven-compiler-plugin
Upgrading SLF4J, Jackson databind, maven-compiler-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/281478cb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/281478cb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/281478cb
Branch: refs/heads/master
Commit: 281478cb6a4cb2abbce73c46e9f84c3b05fefa88
Parents: 35b974c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 27 15:12:38 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 27 15:12:38 2015 +0100
----------------------------------------------------------------------
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/281478cb/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index c7795f8..fcd568b 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -132,7 +132,7 @@ under the License.
<jar src="lib/httpclient-@{httpclient.version}.jar"/>
<jar src="lib/httpmime-@{httpclient.version}.jar"/>
<jar src="lib/httpcore-4.3.3.jar"/>
- <jar src="lib/jackson-databind-@{jackson.version}.jar"/>
+ <jar src="lib/jackson-databind-@{jackson.version}.1.jar"/>
<jar src="lib/jackson-core-@{jackson.version}.jar"/>
<jar src="lib/jackson-annotations-@{jackson.version}.jar"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/281478cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e2396f5..c1a4717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,7 @@ under the License.
<h2.version>1.4.186</h2.version>
<log4j.version>2.2</log4j.version>
- <slf4j.version>1.7.10</slf4j.version>
+ <slf4j.version>1.7.12</slf4j.version>
<disruptor.version>3.3.2</disruptor.version>
<junit.version>4.11</junit.version>
@@ -732,7 +732,7 @@ under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version}.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -1027,7 +1027,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<source>${targetJdk}</source>
<target>${targetJdk}</target>