summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dependencies-bom/pom.xml11
-rw-r--r--dependencies-odl-bom/pom.xml2
-rw-r--r--odlparent/binding-parent/pom.xml2
-rw-r--r--odlparent/bundle-parent/pom.xml2
-rw-r--r--odlparent/feature-repo-parent/pom.xml2
-rw-r--r--odlparent/karaf4-parent/pom.xml2
-rw-r--r--odlparent/mdsal-it-parent/pom.xml2
-rw-r--r--odlparent/odlparent-lite/pom.xml2
-rw-r--r--odlparent/odlparent/pom.xml2
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml2
-rw-r--r--odlparent/single-feature-parent/pom.xml2
-rwxr-xr-xoparent/pom.xml13
12 files changed, 17 insertions, 27 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 74bf2a45..fac96450 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.8</version>
+ <version>2.3.1</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -264,18 +264,13 @@
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-analytics</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
- <version>1.6.6</version>
+ <version>1.6.9</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
- <version>1.6.6</version>
+ <version>1.6.9</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 1cf4cb9a..27076a60 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey</groupId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 3c67eea1..1ac5f71b 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 7863de37..5ca12e84 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 1c92b029..fa56a6a7 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 31897729..bc136043 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 2fada54d..43d3f30e 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 1c992c55..46ddaf9e 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index ef46a0fa..949942a3 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index b2deff05..e5eeb722 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4e83e955..455783dd 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -460,7 +460,7 @@
<message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
- <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
+ <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index b3898c08..7b0f9795 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -141,7 +141,6 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -300,13 +299,11 @@
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
- runtime agent. -->
+ <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
<propertyName>surefireArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for unit tests is created
- after unit tests have been run. -->
+ <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
<execution>
<id>post-unit-test</id>
<phase>test</phase>
@@ -329,13 +326,11 @@
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
- runtime agent. -->
+ <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
<propertyName>failsafeArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for integration tests after
- integration tests have been run. -->
+ <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
<execution>
<id>post-integration-test</id>
<phase>post-integration-test</phase>