Repository: camel Updated Branches: refs/heads/master 4b094993f -> 2048487e6
[CAMEL-11336] Updated dozer to 6.0.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/98d2f3f9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/98d2f3f9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/98d2f3f9 Branch: refs/heads/master Commit: 98d2f3f993bbe011242242f1bc0a985dfe52d6d8 Parents: 4b09499 Author: Gareth Healy <garethahe...@gmail.com> Authored: Fri May 26 13:55:09 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri May 26 15:02:16 2017 +0200 ---------------------------------------------------------------------- components/camel-dozer/pom.xml | 4 ++-- .../org/apache/camel/converter/dozer/DozerTypeConverter.java | 2 +- docs/user-manual/en/dozer-type-conversion.adoc | 7 +++---- parent/pom.xml | 6 +++--- platforms/karaf/features/src/main/resources/features.xml | 2 +- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 6 +++--- 6 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/components/camel-dozer/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml index d811899..2467fd7 100644 --- a/components/camel-dozer/pom.xml +++ b/components/camel-dozer/pom.xml @@ -45,8 +45,8 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> + <groupId>com.github.dozermapper</groupId> + <artifactId>dozer-core</artifactId> </dependency> <dependency> <groupId>javax.el</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java index e1576f8..fffdb62 100644 --- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java +++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * types. <code>DozerTypeConverter</code>s are created and installed into a * {@link CamelContext} by an instance of {@link DozerTypeConverterLoader}. * <p> - * See <a href="http://dozer.sourceforge.net";>dozer project page</a> or more information on configuring Dozer + * See <a href="https://github.com/DozerMapper/dozer";>dozer project page</a> or more information on configuring Dozer * * @see DozerTypeConverterLoader */ http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/docs/user-manual/en/dozer-type-conversion.adoc ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/dozer-type-conversion.adoc b/docs/user-manual/en/dozer-type-conversion.adoc index 080d8b1..186cba8 100644 --- a/docs/user-manual/en/dozer-type-conversion.adoc +++ b/docs/user-manual/en/dozer-type-conversion.adoc @@ -2,7 +2,7 @@ Dozer Type Conversion ---------------------- -http://dozer.sourceforge.net/documentation/about.html[Dozer] is a fast +https://github.com/DozerMapper/dozer/blob/master/docs/asciidoc/about/about.adoc[Dozer] is a fast and flexible framework for mapping back and forth between Java Beans. Coupled with Camel's automatic type conversion, it's a formidable tool for dealing object to object mapping headaches that crop up in @@ -105,9 +105,8 @@ Configuring Dozer ~~~~~~~~~~~~~~~~~ Dozer's configuration is extremely flexible and many mapping scenarios -are covered -http://dozer.sourceforge.net/documentation/mappings.html[here]. For our -simple example, the configuration looks like the following. +are covered https://github.com/DozerMapper/dozer/blob/master/docs/asciidoc/documentation/mappings.adoc[here]. +For our simple example, the configuration looks like the following. *mapping.xml* http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 612e2f3..0e03fa0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -176,7 +176,7 @@ <dnsjava-bundle-version>2.1.8_1</dnsjava-bundle-version> <docker-java-version>3.0.9</docker-java-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> - <dozer-version>5.5.1</dozer-version> + <dozer-version>6.0.0</dozer-version> <drools-version>6.5.0.Final</drools-version> <dropbox-version>1.8.2</dropbox-version> <easymock-version>3.4</easymock-version> @@ -3998,8 +3998,8 @@ <!-- optional dozer dependencies --> <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> + <groupId>com.github.dozermapper</groupId> + <artifactId>dozer-core</artifactId> <version>${dozer-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 4c1dfd2..1f238b1 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -472,7 +472,7 @@ <feature name='camel-dozer' version='${project.version}' resolver='(obr)' start-level='50'> <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:com.github.dozermapper/dozer-core/${dozer-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.commons-beanutils/${commons-beanutils-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/98d2f3f9/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 2f4f225..9b591c2 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -157,9 +157,9 @@ <version>4.2.2</version> </dependency> <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>5.5.1</version> + <groupId>com.github.dozermapper</groupId> + <artifactId>dozer-core</artifactId> + <version>6.0.0</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId>
