Author: davsclaus
Date: Thu Jan 31 13:06:20 2013
New Revision: 1440943
URL: http://svn.apache.org/viewvc?rev=1440943&view=rev
Log:
Upgraded to dozer 5.4.0
Modified:
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Address.java
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Customer.java
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/service/Customer.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Address.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Address.java?rev=1440943&r1=1440942&r2=1440943&view=diff
==============================================================================
---
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Address.java
(original)
+++
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Address.java
Thu Jan 31 13:06:20 2013
@@ -16,9 +16,9 @@
*/
package org.apache.camel.converter.dozer.model;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
public class Address {
Modified:
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Customer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Customer.java?rev=1440943&r1=1440942&r2=1440943&view=diff
==============================================================================
---
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Customer.java
(original)
+++
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/model/Customer.java
Thu Jan 31 13:06:20 2013
@@ -16,9 +16,9 @@
*/
package org.apache.camel.converter.dozer.model;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
public class Customer {
Modified:
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/service/Customer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/service/Customer.java?rev=1440943&r1=1440942&r2=1440943&view=diff
==============================================================================
---
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/service/Customer.java
(original)
+++
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/service/Customer.java
Thu Jan 31 13:06:20 2013
@@ -16,9 +16,9 @@
*/
package org.apache.camel.converter.dozer.service;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
public class Customer {
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1440943&r1=1440942&r2=1440943&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 31 13:06:20 2013
@@ -92,6 +92,7 @@
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
+ <commons-lang3-version>3.1</commons-lang3-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-math-version>2.2</commons-math-version>
<commons-net-version>3.2</commons-net-version>
@@ -106,8 +107,7 @@
<derby-version>10.9.1.0</derby-version>
<dnsjava-version>2.1.1</dnsjava-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
- <!-- we cannot upgrade to dozer 5.4.0 because it requires commons-lang3 -->
- <dozer-version>5.3.2</dozer-version>
+ <dozer-version>5.4.0</dozer-version>
<easymock-version>3.1</easymock-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<ehcache-bundle-version>2.6.2_1</ehcache-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1440943&r1=1440942&r2=1440943&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Jan 31 13:06:20 2013
@@ -277,9 +277,8 @@
<feature version='${project.version}'>camel-core</feature>
<feature>war</feature>
<bundle
dependency='true'>mvn:net.sf.dozer/dozer-osgi/${dozer-version}</bundle>
- <bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${project.version}</bundle>
</feature>