diff options
| -rw-r--r-- | appc-client/pom.xml | 1 | ||||
| -rw-r--r-- | appc-config/appc-config-generator/provider/pom.xml | 13 | ||||
| -rw-r--r-- | appc-config/appc-data-services/features/src/main/resources/features.xml | 2 | ||||
| -rw-r--r-- | appc-directed-graph/appc-dgraph/provider/pom.xml | 11 | ||||
| -rw-r--r-- | appc-directed-graph/dg-loader/pom.xml | 2 | ||||
| -rw-r--r-- | appc-directed-graph/pom.xml | 13 | ||||
| -rwxr-xr-x | appc-inbound/appc-design-services/provider/pom.xml | 11 | ||||
| -rw-r--r-- | appc-inbound/appc-interfaces-service/bundle/pom.xml | 11 | ||||
| -rwxr-xr-x | appc-inbound/pom.xml | 2 | ||||
| -rwxr-xr-x | appc-outbound/appc-network-inventory-client/pom.xml | 2 | ||||
| -rw-r--r-- | appc-sdc-listener/appc-sdc-listener-bundle/pom.xml | 16 | ||||
| -rw-r--r-- | appc-sdc-listener/appc-yang-generator/pom.xml | 13 |
12 files changed, 86 insertions, 11 deletions
diff --git a/appc-client/pom.xml b/appc-client/pom.xml index 2b3dc1119..e90f29b94 100644 --- a/appc-client/pom.xml +++ b/appc-client/pom.xml @@ -223,7 +223,6 @@ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 910ac6d85..50a016608 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -73,7 +73,18 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - </dependency> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> <dependency> <groupId>com.att.eelf</groupId> diff --git a/appc-config/appc-data-services/features/src/main/resources/features.xml b/appc-config/appc-data-services/features/src/main/resources/features.xml index 6bc7cc9fc..7d58abb1c 100644 --- a/appc-config/appc-data-services/features/src/main/resources/features.xml +++ b/appc-config/appc-data-services/features/src/main/resources/features.xml @@ -37,7 +37,7 @@ <bundle>mvn:commons-lang/commons-lang/2.6</bundle> - <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle> + <bundle>mvn:commons-collections/commons-collections/3.2.2</bundle> <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml index 57f905ad3..0c34f03a9 100644 --- a/appc-directed-graph/appc-dgraph/provider/pom.xml +++ b/appc-directed-graph/appc-dgraph/provider/pom.xml @@ -79,6 +79,17 @@ <artifactId>velocity</artifactId> <version>1.7</version> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> </dependency> <dependency> diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml index 9ad7c76d2..26c459e60 100644 --- a/appc-directed-graph/dg-loader/pom.xml +++ b/appc-directed-graph/dg-loader/pom.xml @@ -46,7 +46,7 @@ <java.version.source>1.8</java.version.source> <java.version.target>1.8</java.version.target> <logback.version>1.2.3</logback.version> - <common.collections.version>3.2.1</common.collections.version> + <commons.collections.version>3.2.2</commons.collections.version> <common.io.version>2.5</common.io.version> <jettison.version>1.3.7</jettison.version> <licenseDir>${project.parent.parent.basedir}</licenseDir> diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index 567e6e880..ec0aaeca1 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -43,7 +43,7 @@ <snakeyaml.version>1.12</snakeyaml.version> <velocity.version>1.7</velocity.version> <jettison.version>1.3.7</jettison.version> - <common.collections.version>3.2.1</common.collections.version> + <commons.collections.version>3.2.2</commons.collections.version> <common.io.version>2.5</common.io.version> <tosca.datatype.version>1.1.0</tosca.datatype.version> <licenseDir>${project.parent.basedir}</licenseDir> @@ -92,6 +92,17 @@ <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>{commons.collections.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index da027a559..b72f29048 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -157,6 +157,17 @@ <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.7</version> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 997600227..8a4586ea3 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -141,6 +141,17 @@ <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.7</version> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml index 4517fa030..d6373ac7e 100755 --- a/appc-inbound/pom.xml +++ b/appc-inbound/pom.xml @@ -37,7 +37,7 @@ <snakeyaml.version>1.12</snakeyaml.version> <velocity.version>1.7</velocity.version> <jettison.version>1.3.7</jettison.version> - <common.collections.version>3.2.1</common.collections.version> + <commons.collections.version>3.2.2</commons.collections.version> <common.io.version>2.5</common.io.version> <tosca.datatype.version>1.1.0</tosca.datatype.version> </properties> diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index 900788239..0dd292379 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -37,7 +37,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <logback.version>1.2.3</logback.version> - <common.collections.version>3.2.1</common.collections.version> + <common.collections.version>3.2.2</common.collections.version> <common.io.version>2.5</common.io.version> <jettison.version>1.3.7</jettison.version> <velocity.version>1.7</velocity.version> diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml index 2e61b7010..b59525201 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml @@ -150,9 +150,19 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.7</version> - </dependency> - - <dependency> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-impl</artifactId> <version>${odl.yangtools.version}</version> diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml index 413698ff9..0c45afb5d 100644 --- a/appc-sdc-listener/appc-yang-generator/pom.xml +++ b/appc-sdc-listener/appc-yang-generator/pom.xml @@ -48,6 +48,17 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.7</version> + <exclusions> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> @@ -94,4 +105,4 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </plugins> </build> -</project>
\ No newline at end of file +</project> |