diff options
| -rw-r--r-- | framework/pom.xml | 17 | ||||
| -rw-r--r-- | grpc/pom.xml | 5 | ||||
| -rw-r--r-- | main/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 7 | ||||
| -rw-r--r-- | profiles/command/pom.xml | 2 | ||||
| -rw-r--r-- | profiles/http/pom.xml | 12 | ||||
| -rw-r--r-- | profiles/pom.xml | 10 | ||||
| -rw-r--r-- | profiles/snmp/pom.xml | 2 | ||||
| -rw-r--r-- | validate/sample-mock-generator/pom.xml | 2 | ||||
| -rw-r--r-- | validate/sample-yaml-generator/pom.xml | 2 | ||||
| -rw-r--r-- | validate/validation/pom.xml | 2 |
11 files changed, 57 insertions, 16 deletions
diff --git a/framework/pom.xml b/framework/pom.xml index f57bb881..68843ade 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -107,7 +107,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>${jmockit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -116,6 +116,11 @@ <version>1.19</version> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> </dependencies> <build> <plugins> @@ -142,6 +147,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> + <configuration> + <argLine> + -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar + </argLine> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/grpc/pom.xml b/grpc/pom.xml index 91d5d623..af81fe99 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -62,6 +62,11 @@ <artifactId>proto-google-common-protos</artifactId> <version>0.1.9</version> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> </dependencies> <build> <extensions> diff --git a/main/pom.xml b/main/pom.xml index 9641f943..2361089a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>${jmockit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -134,6 +134,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> + <configuration> + <argLine> + -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar + </argLine> + </configuration> + </plugin> </plugins> </build> @@ -34,6 +34,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <package.name>cli</package.name> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <jmockit.version>1.43</jmockit.version> </properties> <modules> @@ -59,6 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> <configuration> <systemPropertyVariables> <ONAP_CLI_HOME>.</ONAP_CLI_HOME> @@ -87,10 +89,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <release>11</release> </configuration> </plugin> <plugin> diff --git a/profiles/command/pom.xml b/profiles/command/pom.xml index ddd3279f..2b56c54b 100644 --- a/profiles/command/pom.xml +++ b/profiles/command/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml index 3dee45c4..35bbbc1a 100644 --- a/profiles/http/pom.xml +++ b/profiles/http/pom.xml @@ -105,11 +105,6 @@ Excluded commons-codec vulnerable version and added invulnerable version <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> </exclusion> - <!--JIRA: CLI-253--> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -126,7 +121,7 @@ Excluded commons-codec vulnerable version and added invulnerable version <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> @@ -135,6 +130,11 @@ Excluded commons-codec vulnerable version and added invulnerable version <version>1.19</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.10.0</version> + </dependency> </dependencies> <build> <plugins> diff --git a/profiles/pom.xml b/profiles/pom.xml index 39176e24..62893578 100644 --- a/profiles/pom.xml +++ b/profiles/pom.xml @@ -125,6 +125,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> + <configuration> + <argLine> + -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar + </argLine> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/profiles/snmp/pom.xml b/profiles/snmp/pom.xml index 43e5ff51..577d5ddd 100644 --- a/profiles/snmp/pom.xml +++ b/profiles/snmp/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml index 404ddefe..76546ef6 100644 --- a/validate/sample-mock-generator/pom.xml +++ b/validate/sample-mock-generator/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> diff --git a/validate/sample-yaml-generator/pom.xml b/validate/sample-yaml-generator/pom.xml index 89ef1b4b..2dcf57fa 100644 --- a/validate/sample-yaml-generator/pom.xml +++ b/validate/sample-yaml-generator/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml index 5c85481f..59dbffb4 100644 --- a/validate/validation/pom.xml +++ b/validate/validation/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> - <version>1.19</version> + <version>1.43</version> <scope>test</scope> </dependency> <dependency> |