X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=7913e8c8d012a07501b3ec8a9370dadc8fa617c2;hb=749e40c104edf46362b496219151a4f3f0c38c7c;hp=ff99edbd17695781e35fa06bec04e2ae150bc3aa;hpb=939bd7884a0f9a358bd3a2bc36d3a7b73a330d42;p=odlparent.git
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ff99edbd1..7913e8c8d 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
org.opendaylight.odlparent
odlparent-lite
- 9.0.4-SNAPSHOT
+ 10.0.0-SNAPSHOT
../odlparent-lite
@@ -25,7 +25,7 @@
scm:git:ssh://git.opendaylight.org:29418/odlparent.git
scm:git:ssh://git.opendaylight.org:29418/odlparent.git
HEAD
- https://wiki.opendaylight.org/view/ODL_Root_Parent:Main
+ https://wiki.opendaylight.org/display/ODL/ODL+Root+Parent
- 11
-
- 4.3.2
+ 4.3.4
- 1.69
+ 1.70
@@ -64,7 +58,6 @@
**/gen/**,**/generated-sources/**,**/generated-test-sources/**,**/yang-gen/**,**/yang-gen-config/**,**/yang-gen-sal/**,**/yang-gen-code/**,**/pax/**
- false
true
@@ -107,7 +100,7 @@
org.opendaylight.odlparent
odlparent-artifacts
- 9.0.4-SNAPSHOT
+ 10.0.0-SNAPSHOT
import
pom
@@ -135,6 +128,13 @@
+
+ org.junit
+ junit-bom
+ 5.8.1
+ pom
+ import
+
junit
junit
@@ -151,13 +151,13 @@
org.mockito
mockito-core
- 3.9.0
+ 4.1.0
test
org.mockito
mockito-inline
- 3.9.0
+ 4.1.0
test
@@ -195,37 +195,7 @@
org.awaitility
awaitility
- 4.1.0
- test
-
-
- org.powermock
- powermock-api-mockito2
- 2.0.9
- test
-
-
- org.powermock
- powermock-api-support
- 2.0.9
- test
-
-
- org.powermock
- powermock-core
- 2.0.9
- test
-
-
- org.powermock
- powermock-module-junit4
- 2.0.9
- test
-
-
- org.powermock
- powermock-reflect
- 2.0.9
+ 4.1.1
test
@@ -259,19 +229,19 @@
ch.qos.logback
logback-core
- 1.2.5
+ 1.2.9
ch.qos.logback
logback-classic
- 1.2.5
+ 1.2.9
org.apache.logging.log4j
log4j-bom
- 2.14.1
+ 2.16.0
import
pom
@@ -363,7 +333,7 @@
javax.annotation
javax.annotation-api
- 1.3.1
+ 1.3.2
true
@@ -397,7 +367,7 @@
@@ -408,12 +378,12 @@
com.fasterxml.woodstox
woodstox-core
- 6.2.6
+ 6.2.7
com.fasterxml.jackson
jackson-bom
- 2.11.4
+ 2.12.5
import
pom
@@ -439,16 +409,10 @@
2.2.600
provided
-
com.google.code.gson
gson
- 2.8.5
+ 2.8.9
commons-fileupload
@@ -471,7 +435,7 @@
io.netty
netty-bom
- 4.1.67.Final
+ 4.1.72.Final
pom
import
@@ -522,57 +486,391 @@
org.jolokia
jolokia-osgi
- 1.6.2
+ 1.7.1
+
org.osgi
- org.osgi.service.component.annotations
+ org.osgi.dto
+ 1.1.1
+ provided
+
+
+ org.osgi
+ org.osgi.resource
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.framework
+ 1.9.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.permissionadmin
+ 1.2.1
+ provided
+
+
+ org.osgi
+ org.osgi.service.condpermadmin
+ 1.1.1
+ provided
+
+
+ org.osgi
+ org.osgi.service.packageadmin
+ 1.2.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.startlevel
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.resolver
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.url
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.util.tracker
+ 1.5.2
+ provided
+
+
+
+
+ org.osgi
+ org.osgi.annotation.versioning
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.annotation.bundle
+ 1.0.0
+ provided
+
+
+
+
+ org.osgi
+ org.osgi.application
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.namespace.contract
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.namespace.extender
+ 1.0.1
+ provided
+
+
+ org.osgi
+ org.osgi.namespace.implementation
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.namespace.service
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.namespace.unresolvable
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.async
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.application
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.blueprint
+ 1.0.2
+ provided
+
+
+
+ org.osgi
+ org.osgi.service.clusterinfo
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.cm
+ 1.6.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.component
1.4.0
provided
org.osgi
- org.osgi.service.metatype.annotations
+ org.osgi.service.component.annotations
1.4.0
+ provided
-
org.osgi
- osgi.annotation
- 7.0.0
+ org.osgi.service.configurator
+ 1.0.0
provided
org.osgi
- osgi.cmpn
- 7.0.0
+ org.osgi.service.coordinator
+ 1.0.2
provided
org.osgi
- osgi.core
- 7.0.0
+ org.osgi.service.deploymentadmin
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.device
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.dmt
+ 2.0.2
provided
-
org.osgi
-
org.osgi.service.event
1.4.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.http
+ 1.2.1
+ provided
+
+
+ org.osgi
+ org.osgi.service.http.whiteboard
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.io
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.jaxrs
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.jdbc
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.jndi
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.jpa
+ 1.0.0
+ provided
+
+ org.osgi
+ org.osgi.service.log
+ 1.4.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.metatype
+ 1.4.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.metatype.annotations
+ 1.4.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.monitor
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.prefs
+ 1.1.1
+ provided
+
+
+ org.osgi
+ org.osgi.service.provisioning
+ 1.2.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.remoteserviceadmin
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.repository
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.rest
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.serviceloader
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.subsystem
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.transaction.control
+ 1.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.upnp
+ 1.2.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.useradmin
+ 1.1.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.wireadmin
+ 1.0.1
+ provided
+
+
+ org.osgi
+ org.osgi.util.converter
+ 1.0.1
+ provided
+
+
+ org.osgi
+ org.osgi.util.function
+ 1.2.0
+ provided
+
+
+ org.osgi
+ org.osgi.util.measurement
+ 1.0.2
+ provided
+
+
+ org.osgi
+ org.osgi.util.position
+ 1.0.1
+ provided
+
+
+ org.osgi
+ org.osgi.util.promise
+ 1.2.0
+ provided
+
+
+ org.osgi
+ org.osgi.util.pushstream
+ 1.0.1
+ provided
+
+
+ org.osgi
+ org.osgi.util.xml
+ 1.0.1
+ provided
+
+
+
org.apache.aries.quiesce
org.apache.aries.quiesce.api
@@ -590,87 +888,87 @@
org.ops4j.pax.exam
pax-exam
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-container-forked
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-container-karaf
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-container-native
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-extender-service
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-inject
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-invoker-junit
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-features
- 4.13.4
+ 4.13.5
xml
test
org.ops4j.pax.exam
pax-exam-junit4
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-link-mvn
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.exam
pax-exam-link-assembly
- 4.13.4
+ 4.13.5
test
org.ops4j.pax.url
pax-url-link
- 2.5.4
+ 2.6.10
test
org.ops4j.pax.url
pax-url-aether
- 2.5.4
+ 2.6.10
test
org.ops4j.pax.url
pax-url-wrap
- 2.5.4
+ 2.6.10
@@ -683,32 +981,32 @@
org.xmlunit
xmlunit-core
- 2.8.2
+ 2.8.3
test
org.xmlunit
xmlunit-assertj
- 2.8.2
+ 2.8.3
test
org.xmlunit
xmlunit-assertj3
- 2.8.2
+ 2.8.3
test
org.xmlunit
xmlunit-matchers
- 2.8.2
+ 2.8.3
test
org.xmlunit
xmlunit-legacy
- 2.8.2
+ 2.8.3
test
@@ -717,14 +1015,14 @@
org.gaul
modernizer-maven-annotations
- 2.2.0
+ 2.3.0
provided
org.eclipse.jetty
jetty-bom
- 9.4.40.v20210413
+ 9.4.43.v20210629
import
pom
@@ -735,28 +1033,6 @@
1.4.200
-
-
- org.eclipse.xtend
- org.eclipse.xtend.lib
- 2.25.0
-
-
- org.eclipse.xtend
- org.eclipse.xtend.lib.macro
- 2.25.0
-
-
- org.eclipse.xtext
- org.eclipse.xtext.xbase.lib
- 2.25.0
-
-
@@ -795,13 +1071,7 @@
org.antlr
antlr4-runtime
- 4.9.2
-
-
- org.apache.aries.blueprint
- blueprint-maven-plugin-annotation
- 1.3.0
- true
+ 4.9.3
@@ -880,11 +1150,26 @@
hamcrest-library
test
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
junit
junit
test
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
org.mockito
mockito-core
@@ -910,7 +1195,7 @@
org.opendaylight.odlparent
checkstyle
- 9.0.4-SNAPSHOT
+ 10.0.0-SNAPSHOT
com.github.sevntu-checkstyle
@@ -929,7 +1214,7 @@
true
true
true
- **\/*.java, **\/*.xtend
+ **\/*.java
org/opendaylight/yang/gen/**,
**/protobuff/messages/**,
@@ -977,34 +1262,8 @@
-
- org.apache.maven.plugins
- maven-pmd-plugin
- 3.14.0
-
-
- cpd
- process-sources
-
- cpd-check
-
-
- ${pmd.cpd.fail}
-
- 101
- true
-
- ${project.build.directory}/generated-sources
- ${project.build.directory}/generated-test-sources
-
- false
-
-
-
-
maven-compiler-plugin
- 3.8.1
true
@@ -1051,7 +1310,7 @@
org.opendaylight.odlparent
odl-license
- 9.0.4-SNAPSHOT
+ 10.0.0-SNAPSHOT
license
${project.build.outputDirectory}
LICENSE
@@ -1077,7 +1336,7 @@
maven-plugin-plugin
- 3.6.1
+ 3.6.2
@@ -1111,34 +1370,6 @@
-
-
- org.apache.aries.blueprint
- blueprint-maven-plugin
- 1.10.0
-
-
-
- org.apache.xbean
- xbean-finder-shaded
- 4.19
-
-
-
-
- ${project.groupId}
-
-
-
-
-
- blueprint-generate
-
-
-
-
-
org.basepom.maven
duplicate-finder-maven-plugin
@@ -1201,7 +1432,7 @@
org.gaul
modernizer-maven-plugin
- 2.2.0
+ 2.3.0
${odlparent.modernizer.target}
${odlparent.modernizer.enforce}
@@ -1214,11 +1445,14 @@
include:
- ImmutableCollection et al. are not just implementation details, they
- form an API contract.
+ form an API contract
- ImmutableMap/ImmutableSet retain iteration order, whereas their
Map.of()/Set.of() counterparts have unstable iteration order (by design)
+ - Iterables, which we are widely use for efficient discovery of when
+ the Iterable is actually a Collection
-->
com/google/common/collect/Immutable.*
+ com/google/common/collect/Iterables.*
@@ -1234,9 +1468,18 @@
- com.alexecollins.maven.plugin
- script-maven-plugin
- 1.0.0
+ org.apache.karaf.tooling
+ karaf-services-maven-plugin
+ ${karaf.version}
+
+
+ service-metadata-generate
+ process-classes
+
+ service-metadata-generate
+
+
+
@@ -1252,7 +1495,7 @@
org.opendaylight.odlparent
spotbugs
- 9.0.4-SNAPSHOT
+ 10.0.0-SNAPSHOT
@@ -1305,24 +1548,6 @@
properties-maven-plugin
1.0.0
-
- org.eclipse.xtend
- xtend-maven-plugin
-
- 2.25.0
-
-
-
- compile
- testCompile
-
-
- ${project.build.directory}/generated-sources/xtend
- ${project.build.directory}/generated-test-sources/xtend
-
-
-
-
org.eclipse.m2e
lifecycle-mapping
@@ -1369,19 +1594,6 @@
-
-
- org.apache.maven.plugins
- maven-pmd-plugin
- [3.6,)
-
- cpd-check
-
-
-
-
-
-
@@ -1486,7 +1698,7 @@
org.antlr
antlr4-maven-plugin
- 4.9.2
+ 4.9.3
@@ -1503,7 +1715,7 @@
- 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
+ Please always use mockito-core instead of mockito-all (see https://jira.opendaylight.org/browse/ODLPARENT-59), and spotbugs:annotations instead of findbugs:annotations
org.mockito:mockito-all
com.google.code.findbugs:annotations
@@ -1565,9 +1777,6 @@
maven-checkstyle-plugin
-
- maven-pmd-plugin
-
maven-source-plugin
@@ -1604,56 +1813,24 @@
- com.alexecollins.maven.plugin
- script-maven-plugin
+ org.opendaylight.odlparent
+ copy-files-plugin
+ 10.0.0-SNAPSHOT
-
- prepare-package
-
- execute
-
-
-
-
-
-
-
-
- org.apache-extras.beanshell
- bsh
- 2.0b6
-
-
+
+ prepare-package
+
+ copy-files
+
+
+
+ README*
+ CONTRIBUTING*
+ PROJECT_INFO.yaml
+
+
+
+