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 2013/08/21 18:15:57 UTC
svn commit: r1516198 - in /syncope/trunk: client/pom.xml common/pom.xml
console/pom.xml console/src/main/webapp/WEB-INF/weblogic.xml core/pom.xml
core/src/main/webapp/WEB-INF/weblogic.xml legal_ext/LICENSE
Author: ilgrosso
Date: Wed Aug 21 16:15:57 2013
New Revision: 1516198
URL: http://svn.apache.org/r1516198
Log:
Upgrading Jackson info
Modified:
syncope/trunk/client/pom.xml
syncope/trunk/common/pom.xml
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/webapp/WEB-INF/weblogic.xml
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/webapp/WEB-INF/weblogic.xml
syncope/trunk/legal_ext/LICENSE
Modified: syncope/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/client/pom.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/client/pom.xml (original)
+++ syncope/trunk/client/pom.xml Wed Aug 21 16:15:57 2013
@@ -90,7 +90,7 @@ under the License.
</Export-Package>
<Import-Package>
org.apache.http*;version="[4,5)",
- org.codehaus.jackson.annotate;version="[1.9,2)",
+ com.fasterxml.jackson.annotation;version="[2.2.2,2.3)",
org.springframework*;version="[3,4)",
ch.qos.logback.classic;resolution:=optional,
org.slf4j;resolution:=optional,
Modified: syncope/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Wed Aug 21 16:15:57 2013
@@ -93,8 +93,8 @@ under the License.
org.apache.syncope.common*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
- org.apache.commons.lang*;version="[2.6,3)",
- org.codehaus.jackson.annotate;version="[1.9,2)",
+ org.apache.commons.lang3;version="[3.1,3.2)",
+ com.fasterxml.jackson.annotation;version="[2.2.2,2.3)",
org.springframework*;version="[3,4)",
ch.qos.logback.classic;resolution:=optional,
org.slf4j;resolution:=optional,
Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Wed Aug 21 16:15:57 2013
@@ -321,7 +321,7 @@ under the License.
org.apache.syncope.client*;version=${project.version},
org.apache.syncope.common*;version=${project.version},
org.apache.wicket*;version="[6,7)",
- org.codehaus.jackson*;version="[1.9,2)",
+ com.fasterxml.jackson*;version="[2.2.2,2.3)",
org.springframework*;version="[3,4)",
ch.qos.logback.classic;resolution:=optional,
javax.swing.tree;resolution:=optional,
Modified: syncope/trunk/console/src/main/webapp/WEB-INF/weblogic.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/WEB-INF/weblogic.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/WEB-INF/weblogic.xml (original)
+++ syncope/trunk/console/src/main/webapp/WEB-INF/weblogic.xml Wed Aug 21 16:15:57 2013
@@ -28,8 +28,7 @@ under the License.
<prefer-application-packages>
<package-name>org.apache.commons.*</package-name>
<package-name>org.slf4j.*</package-name>
- <package-name>org.codehaus.jackson.*</package-name>
- <package-name>net.sf.cglib.*</package-name>
+ <package-name>com.fasterxml.jackson.*</package-name>
</prefer-application-packages>
</container-descriptor>
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Wed Aug 21 16:15:57 2013
@@ -581,7 +581,7 @@ under the License.
org.apache.openjpa*;version="[2,3)",
org.apache.syncope.common*;version=${project.version},
org.apache.velocity*;version="[1.7,2)",
- org.codehaus.jackson*;version="[1.9,2)",
+ com.fasterxml.jackson*;version="[2.2.2,2.3)",
org.jasypt.digest;version="[1.9,2)",
org.quartz*;version="[2.1,3)",
org.springframework*;version="[3,4)",
Modified: syncope/trunk/core/src/main/webapp/WEB-INF/weblogic.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/webapp/WEB-INF/weblogic.xml?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/core/src/main/webapp/WEB-INF/weblogic.xml (original)
+++ syncope/trunk/core/src/main/webapp/WEB-INF/weblogic.xml Wed Aug 21 16:15:57 2013
@@ -29,8 +29,7 @@ under the License.
<package-name>org.apache.commons.*</package-name>
<package-name>org.apache.openjpa.*</package-name>
<package-name>org.slf4j.*</package-name>
- <package-name>org.codehaus.jackson.*</package-name>
- <package-name>net.sf.cglib.*</package-name>
+ <package-name>com.fasterxml.jackson.*</package-name>
</prefer-application-packages>
</container-descriptor>
@@ -39,4 +38,4 @@ under the License.
<jndi-name>syncopeDataSource</jndi-name>
<res-ref-name>jdbc/syncopeDataSource</res-ref-name>
</resource-description>-->
-</weblogic-web-app>
\ No newline at end of file
+</weblogic-web-app>
Modified: syncope/trunk/legal_ext/LICENSE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1516198&r1=1516197&r2=1516198&view=diff
==============================================================================
--- syncope/trunk/legal_ext/LICENSE (original)
+++ syncope/trunk/legal_ext/LICENSE Wed Aug 21 16:15:57 2013
@@ -304,12 +304,12 @@ This is licensed under the AL 2.0, see a
==
-For Jackson (http://jackson.codehaus.org/):
+For Jackson (https://github.com/FasterXML/jackson):
This is licensed under the AL 2.0, see above.
==
-For ConnId (http://connid.googlecode.com/):
+For ConnId (http://tirasa.github.io/ConnId/):
This is licensed under CDDL 1.0.
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0