diff options
| -rw-r--r-- | asdc-tests/pom.xml | 19 | ||||
| -rw-r--r-- | asdctool/pom.xml | 27 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 24 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 20 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 34 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 32 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 19 | ||||
| -rw-r--r-- | common-be/pom.xml | 25 | ||||
| -rw-r--r-- | distribution-ci/pom.xml | 30 | ||||
| -rw-r--r-- | pom.xml | 131 | ||||
| -rw-r--r-- | security-utils/pom.xml | 1 | ||||
| -rw-r--r-- | ui-ci-dev/pom.xml | 32 | ||||
| -rw-r--r-- | ui-ci/pom.xml | 31 | ||||
| -rw-r--r-- | webseal-simulator/pom.xml | 7 |
14 files changed, 287 insertions, 145 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 8ad4db889a..b10e3b2309 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -14,11 +14,18 @@ <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>${guava.version}</version> <scope>compile</scope> </dependency> @@ -120,18 +127,21 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> @@ -179,12 +189,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> @@ -206,6 +218,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> @@ -246,14 +259,16 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 1773107822..99b4bbe0a2 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -14,6 +14,27 @@ <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>compile</scope> + </dependency> + <!--<dependency>--> <!--<groupId>org.springframework</groupId>--> <!--<artifactId>spring-beans</artifactId>--> @@ -160,24 +181,28 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <!-- groovy --> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -282,11 +307,13 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> <!-- Spring 4 dependencies --> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 878fce7db2..add2bd4e79 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -61,6 +61,15 @@ <dependencies> + + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> @@ -122,6 +131,7 @@ <artifactId>jersey-container-servlet-core</artifactId> </dependency> + <!-- Swagger Dependencies End --> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -154,18 +164,21 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> @@ -211,12 +224,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> @@ -303,12 +318,15 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.codehaus.janino</groupId> <artifactId>janino</artifactId> + <version>${janino.version}</version> <scope>compile</scope> </dependency> @@ -323,6 +341,8 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>compile</scope> </dependency> <!-- TITAN --> @@ -365,6 +385,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> <scope>compile</scope> </dependency> <!-- TITAN END --> @@ -406,6 +427,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> <scope>compile</scope> </dependency> @@ -546,12 +568,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 2674fa12fd..65790d35a2 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -24,6 +24,14 @@ <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -131,12 +139,14 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> @@ -181,12 +191,14 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>provided</scope> </dependency> <dependency> @@ -204,7 +216,9 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>${mockito.version}</version><!--$NO-MVN-MAN-VER$ --> + <!--<version>${mockito.version}</version><!–$NO-MVN-MAN-VER$ –>--> + <version>1.10.19</version> + <scope>test</scope> </dependency> <dependency> @@ -232,12 +246,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>provided</scope> </dependency> @@ -253,6 +269,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> @@ -305,6 +322,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> <scope>provided</scope> </dependency> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index f9202c0ae0..248fad7700 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -18,6 +18,20 @@ <dependencies> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> @@ -110,30 +124,35 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.janino</groupId> <artifactId>janino</artifactId> + <version>${janino.version}</version> <scope>compile</scope> </dependency> @@ -160,6 +179,7 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> + <version>2.24</version> <scope>compile</scope> </dependency> @@ -191,18 +211,21 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> @@ -210,19 +233,22 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.3.2</version> + <!--<version>4.3.2</version>--> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> @@ -251,6 +277,7 @@ <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> @@ -273,6 +300,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>${guava.version}</version> <scope>compile</scope> </dependency> @@ -285,11 +313,13 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> <scope>compile</scope> </dependency> @@ -334,6 +364,8 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> + <version>1.10.19</version> + <scope>test</scope> </dependency> <dependency> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 93b21bf8df..3f21a91b5d 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -17,6 +17,20 @@ <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>provided</scope> + </dependency> + <!-- yaml to object converter --> <dependency> <groupId>org.yaml</groupId> @@ -134,12 +148,14 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> @@ -228,6 +244,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> <scope>provided</scope> </dependency> @@ -235,12 +252,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>provided</scope> </dependency> @@ -260,30 +279,27 @@ <!-- CASSANDRA END --> <!-- test --> - - <!--dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <scope>test</scope> - </dependency--> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.7.4</version> + <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> + <!--<version>1.7.4</version>--> <scope>test</scope> </dependency> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 084bd063a7..777e01f506 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -15,6 +15,13 @@ <dependencies> <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> @@ -109,6 +116,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>provided</scope> </dependency> @@ -121,6 +129,7 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> + <version>2.24</version> <scope>provided</scope> </dependency> @@ -151,12 +160,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>provided</scope> </dependency> @@ -190,36 +201,42 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> <scope>provided</scope> </dependency> <!-- logging --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <!-- logging end --> @@ -240,12 +257,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> diff --git a/common-be/pom.xml b/common-be/pom.xml index 1a94d47771..5800257096 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -25,6 +25,27 @@ <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.10.19</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>provided</scope> + </dependency> + <!-- yaml to object converter --> <dependency> <groupId>org.yaml</groupId> @@ -139,18 +160,21 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <version>${logback.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> <scope>provided</scope> </dependency> @@ -172,6 +196,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> diff --git a/distribution-ci/pom.xml b/distribution-ci/pom.xml index 8e8569ebce..d8603be39a 100644 --- a/distribution-ci/pom.xml +++ b/distribution-ci/pom.xml @@ -13,6 +13,35 @@ <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>compile</scope> + </dependency> + <!-- yaml to object converter --> <dependency> <groupId>org.yaml</groupId> @@ -51,6 +80,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>compile</scope> </dependency> @@ -147,6 +147,7 @@ <!-- Logging start --> <!-- logback --> + <logback.version>1.1.2</logback.version> <groovy.version>2.3.5</groovy.version> <janino.version>3.0.6</janino.version> <!-- aspects --> @@ -219,18 +220,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${lang3.version}</version> - </dependency> - - <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> <version>${elastic-search.version}</version> @@ -263,24 +252,12 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.10</version> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet</artifactId> - <version>2.24</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> @@ -305,70 +282,6 @@ <scope>provided</scope> </dependency> - <!-- http client --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${httpclient.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpcore.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.1.2</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>1.1.2</version> - <scope>provided</scope> - </dependency> - - <!-- Logback extensions --> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - <version>${janino.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.9.10</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.relevantcodes</groupId> <artifactId>extentreports</artifactId> @@ -376,47 +289,12 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> <version>${json-simple.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.annotations.version}</version> - <scope>provided</scope> - </dependency> - <!-- functional java --> <dependency> <groupId>org.functionaljava</groupId> @@ -432,12 +310,7 @@ <version>${jcabi.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectjrt.version}</version> - <scope>provided</scope> - </dependency> + <!-- System metrics --> <dependency> diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 79feeb18a0..a9a8c68da4 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -16,6 +16,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> </dependency> </dependencies> diff --git a/ui-ci-dev/pom.xml b/ui-ci-dev/pom.xml index b84322c8f1..b33ab9166d 100644 --- a/ui-ci-dev/pom.xml +++ b/ui-ci-dev/pom.xml @@ -14,6 +14,28 @@ <dependencies> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> @@ -57,12 +79,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> @@ -83,6 +107,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> @@ -111,14 +136,16 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> @@ -131,6 +158,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>compile</scope> </dependency> diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 5c0726d399..a1d0d8213e 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -16,6 +16,27 @@ <dependencies> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> <version>2.48.0</version> @@ -59,12 +80,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> + <version>${httpclient.version}</version> <scope>compile</scope> </dependency> @@ -86,6 +109,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> <scope>compile</scope> </dependency> @@ -114,14 +138,16 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.3.1</version> + <!--<version>2.3.1</version>--> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> @@ -135,6 +161,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>compile</scope> </dependency> diff --git a/webseal-simulator/pom.xml b/webseal-simulator/pom.xml index 748e286c03..cbfcd7185f 100644 --- a/webseal-simulator/pom.xml +++ b/webseal-simulator/pom.xml @@ -19,6 +19,13 @@ <dependencies> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> |