diff options
| -rw-r--r-- | catalog-model/pom.xml | 2 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 9 | ||||
| -rw-r--r-- | common-be/pom.xml | 6 | ||||
| -rw-r--r-- | onboarding/pom.xml | 11 | ||||
| -rw-r--r-- | openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml | 6 | ||||
| -rw-r--r-- | openecomp-be/tools/zusammen-tools/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 15 |
7 files changed, 24 insertions, 26 deletions
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index a9f9babe91..93393ffa0b 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -287,7 +287,7 @@ <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <scope>test</scope> - <version>4.0.7.RELEASE</version> + <version>${spring.version}</version> </dependency> <dependency> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 57c843dffd..7286bf6ee4 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -22,8 +22,17 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> <!-- functional java --> <dependency> <groupId>org.functionaljava</groupId> diff --git a/common-be/pom.xml b/common-be/pom.xml index c4489b0e17..2827dad090 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -155,6 +155,12 @@ <version>${togglz.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>compile</scope> + </dependency> </dependencies> <build> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 3bb2105af0..f4e9ef581a 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -60,7 +60,6 @@ <mvn.antrun.version>1.8</mvn.antrun.version> <!-- Onboarding 3rd party versions --> - <aspectj.version>1.8.9</aspectj.version> <aspectjrt.version>${aspectj.version}</aspectjrt.version> <bsh.version>2.0b6</bsh.version> <cglib.nodep.version>3.2.4</cglib.nodep.version> @@ -72,15 +71,12 @@ <commons.lang3.version>3.4</commons.lang3.version> <cxf.version>3.3.6</cxf.version> <datastax.cassandra.version>3.8.0</datastax.cassandra.version> - <easymock.version>3.4</easymock.version> <groovy.minimal.version>1.5.8</groovy.minimal.version> - <fop.version>2.2</fop.version> <freemarker.version>2.3.26-incubating</freemarker.version> <hibernate.validator.version>5.3.6.Final</hibernate.validator.version> <http.client.version>4.5.3</http.client.version> <http.core.version>4.4.1</http.core.version> <httpasyncclient.version>4.1.2</httpasyncclient.version> - <janino.version>2.7.7</janino.version> <com.sun.xml.version>2.3.3</com.sun.xml.version> <javax.el.version>2.2.4</javax.el.version> <javax.el-api.version>3.0.1-b04</javax.el-api.version> @@ -91,13 +87,9 @@ <jcommander.version>1.58</jcommander.version> <jersey.core.version>1.19.1</jersey.core.version> <jersey.multipart.version>1.18.1</jersey.multipart.version> - <logback.version>1.2.3</logback.version> - <mockito.all.version>1.10.19</mockito.all.version> <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version> - <org.reflections.version>0.9.10</org.reflections.version> - <servlet.version>2.5</servlet.version> <slf4j.version>1.7.21</slf4j.version> - <spring.framework.version>4.3.18.RELEASE</spring.framework.version> + <spring.framework.version>${spring.version}</spring.framework.version> <swagger.version>2.0.8</swagger.version> <woodstox.version>4.4.1</woodstox.version> <zusammen.version>1.0.2</zusammen.version> @@ -106,7 +98,6 @@ <zusammen-index-store.version>1.0.0</zusammen-index-store.version> <zusammen-common-utilities.version>1.0.3</zusammen-common-utilities.version> <build.tools.version>${project.version}</build.tools.version> - <bouncycastle.version>1.61</bouncycastle.version> </properties> <dependencyManagement> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml index 1fa01660de..db528afda5 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml @@ -28,12 +28,6 @@ <artifactId>logback-classic</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>${easymock.version}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index e611eb5666..af748b28c5 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -31,7 +31,6 @@ </parent> <properties> - <janino.version>2.7.7</janino.version> </properties> <dependencies> @@ -47,7 +47,7 @@ Modifications copyright (c) 2018-2019 Nokia <lang3.version>3.10</lang3.version> <guava.version>18.0</guava.version> <janusgraph.version>0.3.1</janusgraph.version> - <spring.version>4.3.18.RELEASE</spring.version> + <spring.version>5.2.10.RELEASE</spring.version> <jersey-bom.version>2.27</jersey-bom.version> <netty.version>4.1.48.Final</netty.version> <servlet-api.version>3.1.0</servlet-api.version> @@ -71,14 +71,14 @@ Modifications copyright (c) 2018-2019 Nokia <jetty.version>9.4.36.v20210114</jetty.version> <!-- JSON and YAML Parsing --> - <jackson.version>2.11.0</jackson.version> + <jackson.version>2.12.1</jackson.version> <jackson-annotations.version>${jackson.version}</jackson-annotations.version> <clearspring.version>2.1.1</clearspring.version> <skipYamlJsonValidator>false</skipYamlJsonValidator> <!-- Yaml for properties --> - <snakeyaml.version>1.26</snakeyaml.version> + <snakeyaml.version>1.28</snakeyaml.version> <functionaljava.version>4.7</functionaljava.version> <httpclient.version>4.5.3</httpclient.version> <httpcore.version>4.4.1</httpcore.version> @@ -98,8 +98,8 @@ Modifications copyright (c) 2018-2019 Nokia <!-- aspects --> <jcabi.version>0.20.1</jcabi.version> - <aspectjrt.version>1.8.4</aspectjrt.version> - <aspectj.version>1.7.4</aspectj.version> + <aspectj.version>1.8.9</aspectj.version> + <aspectjrt.version>${aspectj.version}</aspectjrt.version> <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version> <!-- Logging end --> @@ -115,8 +115,8 @@ Modifications copyright (c) 2018-2019 Nokia <commons-jci-core.version>1.1</commons-jci-core.version> <!--TESTING--> - <mockito.version>3.3.3</mockito.version> - <mockitoJupiter.version>3.3.3</mockitoJupiter.version> + <mockito.version>3.7.7</mockito.version> + <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version> <jmockit.version>1.35</jmockit.version> <junit.version>4.13.1</junit.version> <junit.platform.version>1.7.1</junit.platform.version> @@ -779,4 +779,3 @@ Modifications copyright (c) 2018-2019 Nokia </site> </distributionManagement> </project> - |