diff --git a/core/pom.xml b/core/pom.xml index e4916d84..acda5124 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,87 +11,48 @@ modelmapper ModelMapper - - 3.3.0 - 9.2 - 2.6 - 0.6.3 - 1.12.3 - 4.2.0 - - - - - - org.ow2.asm - asm - ${asm.version} - - - org.ow2.asm - asm-commons - ${asm.version} - - - - org.ow2.asm asm-tree - ${asm.version} org.objenesis objenesis - ${objenesis.version} net.jodah typetools - ${typetools.version} net.bytebuddy byte-buddy-dep - ${bytebuddy.version} javassist javassist - 3.12.1.GA - test - - - org.slf4j - slf4j-jdk14 - 1.5.8 test org.mockito mockito-core - ${mockito.version} test com.h2database h2 - 1.4.182 test org.hibernate hibernate-entitymanager - 5.6.3.Final test cglib cglib - ${cglib.version} test @@ -99,13 +60,11 @@ net.sf.dozer dozer - 5.3.2 test ma.glasnost.orika orika-core - 1.1.6 test diff --git a/examples/pom.xml b/examples/pom.xml index bb8dc38c..675d3be1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -19,7 +19,7 @@ org.testng testng - 6.5.2 + compile diff --git a/extensions/dagger/pom.xml b/extensions/dagger/pom.xml index 71e924a4..e572e402 100644 --- a/extensions/dagger/pom.xml +++ b/extensions/dagger/pom.xml @@ -11,15 +11,10 @@ modelmapper-dagger ModelMapper Dagger Extension - - 1.0.1 - - com.squareup.dagger dagger - ${dagger.version} provided diff --git a/extensions/gson/pom.xml b/extensions/gson/pom.xml index b968d180..08f69b4c 100644 --- a/extensions/gson/pom.xml +++ b/extensions/gson/pom.xml @@ -15,7 +15,6 @@ com.google.code.gson gson - 2.2.3 provided diff --git a/extensions/guice/pom.xml b/extensions/guice/pom.xml index 3ca919e5..e33a09a7 100644 --- a/extensions/guice/pom.xml +++ b/extensions/guice/pom.xml @@ -15,7 +15,6 @@ com.google.inject guice - 3.0 provided diff --git a/extensions/jackson/pom.xml b/extensions/jackson/pom.xml index d865c75b..34efbcf4 100644 --- a/extensions/jackson/pom.xml +++ b/extensions/jackson/pom.xml @@ -11,21 +11,15 @@ modelmapper-jackson ModelMapper Jackson Extension - - 2.2.1 - - com.fasterxml.jackson.core jackson-core - ${jackson.version} provided com.fasterxml.jackson.core jackson-databind - ${jackson.version} provided diff --git a/extensions/jooq/pom.xml b/extensions/jooq/pom.xml index b4eee98d..5d5e8587 100644 --- a/extensions/jooq/pom.xml +++ b/extensions/jooq/pom.xml @@ -15,14 +15,11 @@ org.jooq jooq - 3.1.0 provided - com.h2database h2 - 1.3.172 test diff --git a/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java b/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java index 84ab045d..429bd188 100644 --- a/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java +++ b/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java @@ -28,7 +28,7 @@ public class RecordValueReaderTest { protected void beforeClass() throws Exception { Class.forName("org.h2.Driver"); ctx = DSL.using(DriverManager.getConnection("jdbc:h2:mem:test"), SQLDialect.H2); - ctx.execute("CREATE TABLE orders (id int(11), customer_id int(11), customer_street_address varchar(25), customer_address_city varchar(25), customer_address_zip varchar(10))"); + ctx.execute("CREATE TABLE orders (id int, customer_id int, customer_street_address varchar(25), customer_address_city varchar(25), customer_address_zip varchar(10))"); } public static class Order { diff --git a/extensions/protobuf/pom.xml b/extensions/protobuf/pom.xml index c984ba3f..f76a9440 100644 --- a/extensions/protobuf/pom.xml +++ b/extensions/protobuf/pom.xml @@ -12,7 +12,7 @@ com.google.protobuf protobuf-java - 3.5.1 + provided diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index 6b4354c5..938bfee7 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -15,7 +15,6 @@ org.springframework spring-beans - 3.0.5.RELEASE provided diff --git a/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java b/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java index 54884f1d..ce725dd7 100644 --- a/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java +++ b/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java @@ -21,8 +21,7 @@ static class Dest { public void testFromSpring() { final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - @SuppressWarnings("deprecation") - RootBeanDefinition bean = new RootBeanDefinition(Dest.class, false); + RootBeanDefinition bean = new RootBeanDefinition(Dest.class, RootBeanDefinition.AUTOWIRE_NO, false); beanFactory.registerBeanDefinition("bean", bean); Provider provider = SpringIntegration.fromSpring(beanFactory); diff --git a/groovy/pom.xml b/groovy/pom.xml index 4a501e06..f8ccaea1 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -15,6 +15,10 @@ ModelMapper Groovy Groovy tests + + 1.8.6 + + org.modelmapper @@ -25,13 +29,12 @@ org.codehaus.groovy groovy-all - 1.8.6 + ${groovy.version} test org.testng testng - 6.8.5 test diff --git a/pom.xml b/pom.xml index 8608fe8d..17a59051 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,26 @@ 1.8 1.8 + 3.3.0 + 9.2 + 3.2 + 0.6.3 + 1.12.3 + 3.12.1.GA + 2.0.206 + 5.6.3.Final + 1.5.8 + 6.9.10 + 4.2.0 + 5.5.1 + 1.5.4 + 1.0.1 + 2.8.9 + 5.0.1 + 2.13.1 + 3.1.0 + 3.19.3 + 5.3.14 @@ -67,11 +87,130 @@ benchmarks + + + + org.ow2.asm + asm-tree + ${asm.version} + + + org.objenesis + objenesis + ${objenesis.version} + + + net.jodah + typetools + ${typetools.version} + + + net.bytebuddy + byte-buddy-dep + ${bytebuddy.version} + + + + + org.testng + testng + ${testng.version} + test + + + javassist + javassist + ${javassist.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + com.h2database + h2 + ${h2.version} + test + + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + test + + + cglib + cglib + ${cglib.version} + test + + + + + net.sf.dozer + dozer + ${dozer.version} + test + + + ma.glasnost.orika + orika-core + ${orika.version} + test + + + + + com.squareup.dagger + dagger + ${dagger.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.inject + guice + ${guice.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.jooq + jooq + ${jooq.version} + provided + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + org.springframework + spring-beans + ${spring.version} + + + + org.testng testng - 6.9.10 test