diff --git a/smp-api/pom.xml b/smp-api/pom.xml index de9cc8a4862ea577b36ee6538f07ecbbbc708f4b..95e526b30dce2298bcb7c94ce48137f90619a760 100644 --- a/smp-api/pom.xml +++ b/smp-api/pom.xml @@ -49,7 +49,7 @@ <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.13.0</version> + <version>0.14.0</version> <executions> <execution> <goals> @@ -73,7 +73,7 @@ <plugin> <groupId>org.jvnet.jaxb2_commons</groupId> <artifactId>jaxb2-basics</artifactId> - <version>0.11.0</version> + <version>1.11.1</version> </plugin> </plugins> </configuration> diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml index 8eb1e20e63de7ce8cc957ee4b30cf9dc867fa39e..5d88e33b922fcb3b2bb8e018798b78a20339cb9b 100644 --- a/smp-parent-pom/pom.xml +++ b/smp-parent-pom/pom.xml @@ -52,8 +52,9 @@ <spring.version>5.1.0.RELEASE</spring.version> <spring.security.version>5.1.0.RELEASE</spring.security.version> <spring.boot.version>2.0.5.RELEASE</spring.boot.version> - <bdmsl.client.version>3.0.0</bdmsl.client.version> - <cxf.version>3.2.1</cxf.version> + <!-- bdmsl.client.version>3.0.0</bdmsl.client.version --> + <bdmsl.api.version>3.1.3</bdmsl.api.version> + <cxf.version>3.2.7</cxf.version> <cxf-xjc-runtime.version>3.2.0</cxf-xjc-runtime.version> <build.helper.maven.version>1.9.1</build.helper.maven.version> <ehcache.version>2.10.0</ehcache.version> @@ -72,17 +73,15 @@ <orika.version>1.4.6</orika.version> <aspectj.version>1.8.6</aspectj.version> <jaxb.version>2.2.11</jaxb.version> - <jaxb2-basics.version>0.11.0</jaxb2-basics.version> + <jaxb2-basics.version>1.11.1</jaxb2-basics.version> <javax.annotation.version>1.2-b02</javax.annotation.version> <!--https://hibernate.atlassian.net/browse/HHH-12436 Bug in OneToOne mapping - (problem in test case: ServiceGroupDaoMetadataIntegrationTest.addNewServiceMetadata) use 5.2.13.Final> - <hibernate.version>5.3.16.Final</hibernate.version --> + (problem in test case: ServiceGroupDaoMetadataIntegrationTest.addNewServiceMetadata) use 5.2.13.Final --> + <!-- hibernate.version>5.3.7.Final</hibernate.version--> <hibernate.version>5.2.13.Final</hibernate.version> <hibernate-jpa.version>1.0.2.Final</hibernate-jpa.version> <hibernate.validator.version>6.0.13.Final</hibernate.validator.version> <h2.version>1.4.187</h2.version> - <oracle.version>12.1.0.1</oracle.version> - <mysql.version>5.1.45</mysql.version> <soapui.plugin.version>5.1.2</soapui.plugin.version> <commons-net.version>1.4.1</commons-net.version> <ant-commons-net.version>1.6.5</ant-commons-net.version> @@ -94,7 +93,7 @@ <!-- lombok.version>1.16.16</lombok.version --> <xmlunit.version>2.5.1</xmlunit.version> <hamcrest.version>2.0.0.0</hamcrest.version> - <jackson.version>2.9.2</jackson.version> + <jackson.version>2.9.7</jackson.version> <!-- jacoco, sonar code coverage settings start --> <sonar.jacoco.reportPath>${maven.multiModuleProjectDirectory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath> @@ -195,14 +194,9 @@ </dependency> <dependency> <groupId>eu.europa.ec.bdmsl</groupId> - <artifactId>bdmsl-client</artifactId> - <version>${bdmsl.client.version}</version> + <artifactId>bdmsl-api</artifactId> + <version>${bdmsl.api.version}</version> </dependency> - <!-- dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> - </dependency --> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> @@ -492,17 +486,7 @@ <artifactId>dnsjava</artifactId> <version>${dnsjava.version}</version> </dependency> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc7</artifactId> - <version>${oracle.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql.version}</version> - </dependency> + <dependency> <groupId>ant</groupId> <artifactId>ant-commons-net</artifactId> @@ -573,25 +557,7 @@ </dependency> </dependencies> - <profiles> - <profile> - <!-- Oracle driver is needed only for integration tests - do not dowlnoad it from repo if tests are skipped --> - <id>Skip Oracle from tests</id> - <activation> - <property> - <name>skipTests</name> - <value>!true</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc7</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> <!-- Build plugins --> <build> diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml index cdc609be8ae8c0dbac413eeea5a226b25a3b5bec..de227fce0506a3378ebed1578e04437ec57e087d 100644 --- a/smp-server-library/pom.xml +++ b/smp-server-library/pom.xml @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>eu.europa.ec.bdmsl</groupId> - <artifactId>bdmsl-client</artifactId> + <artifactId>bdmsl-api</artifactId> </dependency> <dependency> <groupId>eu.europa.ec.edelivery</groupId> @@ -66,10 +66,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> @@ -123,10 +119,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> </dependency> - <!--dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/smp-soapui-tests/pom.xml b/smp-soapui-tests/pom.xml index ee9199473093d25cfc6da73e49e62a039f07f830..0f0a37a4d7bd55d49dd33a2e5c0b6fb11524d8e2 100644 --- a/smp-soapui-tests/pom.xml +++ b/smp-soapui-tests/pom.xml @@ -62,18 +62,7 @@ <value>SMPAdminPassword=${SMPAdminPassword}</value> </projectProperties> </configuration> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql.version}</version> - </dependency> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc7</artifactId> - <version>${oracle.version}</version> - </dependency> - </dependencies> + </plugin> </plugins> </build>