From 339524bc1d9d27295b755a965bca766e6dad4472 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 21 Jan 2021 14:04:44 +0100 Subject: [PATCH] Adopt odlparent-8.1.0/yangtools-6.0.4 Adopt OSGi R7 as well by migrating osgi.core pointers to the new place. Change-Id: I7351883bd53c40b82abda744d9eefcb49ef183d7 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- binding/binding-parent/pom.xml | 2 +- binding/maven-sal-api-gen-plugin/pom.xml | 4 ++-- binding/mdsal-binding-dom-adapter/pom.xml | 6 +++++- binding/mdsal-binding-dom-codec-osgi/pom.xml | 2 +- binding/mdsal-binding-runtime-osgi/pom.xml | 2 +- binding/mdsal-binding-test-utils/pom.xml | 2 +- binding/pom.xml | 2 +- common/pom.xml | 2 +- docs/pom.xml | 6 +++--- dom/dom-parent/pom.xml | 12 ++++++++++-- dom/mdsal-dom-inmemory-datastore/pom.xml | 2 +- dom/mdsal-dom-schema-osgi/pom.xml | 6 +++++- dom/pom.xml | 2 +- entityownership/pom.xml | 2 +- features/feature-parent/pom.xml | 4 ++-- features/features-mdsal-experimental/pom.xml | 2 +- features/features-mdsal/pom.xml | 2 +- features/pom.xml | 2 +- model/iana/pom.xml | 2 +- model/ietf/pom.xml | 2 +- model/pom.xml | 2 +- netty/pom.xml | 2 +- pom.xml | 2 +- replicate/pom.xml | 2 +- singleton-service/pom.xml | 2 +- trace/pom.xml | 2 +- yanglib/pom.xml | 2 +- 28 files changed, 49 insertions(+), 33 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3da8201f09..5a4940ddc6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml index 6a287ad11c..0b0ec7d467 100644 --- a/binding/binding-parent/pom.xml +++ b/binding/binding-parent/pom.xml @@ -58,7 +58,7 @@ org.opendaylight.yangtools yang-maven-plugin - 6.0.3 + 6.0.4 org.opendaylight.mdsal diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml index ee84ca8526..4529aa413f 100644 --- a/binding/maven-sal-api-gen-plugin/pom.xml +++ b/binding/maven-sal-api-gen-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.3 + 6.0.4 pom import diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml index f1108f4968..8f009e0f02 100644 --- a/binding/mdsal-binding-dom-adapter/pom.xml +++ b/binding/mdsal-binding-dom-adapter/pom.xml @@ -60,7 +60,11 @@ org.osgi - org.osgi.core + osgi.annotation + + + org.osgi + osgi.core org.osgi diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml index fcd1c86e41..7520ef25d7 100644 --- a/binding/mdsal-binding-dom-codec-osgi/pom.xml +++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml @@ -30,7 +30,7 @@ org.osgi - org.osgi.core + osgi.core org.osgi diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml index aa4f93f914..c01fb45a8d 100644 --- a/binding/mdsal-binding-runtime-osgi/pom.xml +++ b/binding/mdsal-binding-runtime-osgi/pom.xml @@ -30,7 +30,7 @@ org.osgi - org.osgi.core + osgi.core org.osgi diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml index 4852319699..8996776db5 100644 --- a/binding/mdsal-binding-test-utils/pom.xml +++ b/binding/mdsal-binding-test-utils/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/binding/pom.xml b/binding/pom.xml index 4b6afc2cd1..693c9e02e4 100644 --- a/binding/pom.xml +++ b/binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/common/pom.xml b/common/pom.xml index 6e8eb55a4d..9190d9ad2a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/docs/pom.xml b/docs/pom.xml index dcc34db298..45225b24dd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -456,7 +456,7 @@ org.osgi - org.osgi.core + osgi.core provided @@ -618,8 +618,8 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.3/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.3/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.0/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.4/ diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml index 4dfe2dd462..f056261d7d 100644 --- a/dom/dom-parent/pom.xml +++ b/dom/dom-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 @@ -29,7 +29,7 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.3 + 6.0.4 pom import @@ -40,6 +40,14 @@ pom import + + + + org.osgi + osgi.annotation + 7.0.0 + provided + diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml index 51ac0a14dc..096772da1d 100644 --- a/dom/mdsal-dom-inmemory-datastore/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore/pom.xml @@ -60,7 +60,7 @@ org.osgi - org.osgi.core + osgi.core diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml index 20cbe9311e..3aec3c56cf 100644 --- a/dom/mdsal-dom-schema-osgi/pom.xml +++ b/dom/mdsal-dom-schema-osgi/pom.xml @@ -42,7 +42,11 @@ org.osgi - org.osgi.core + osgi.annotation + + + org.osgi + osgi.core org.osgi diff --git a/dom/pom.xml b/dom/pom.xml index 448c7b5f34..4177c1763d 100644 --- a/dom/pom.xml +++ b/dom/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/entityownership/pom.xml b/entityownership/pom.xml index c960a85504..d9b152d706 100644 --- a/entityownership/pom.xml +++ b/entityownership/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml index 37ee4ec4a2..944ab6e2ed 100644 --- a/features/feature-parent/pom.xml +++ b/features/feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 @@ -27,7 +27,7 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.3 + 6.0.4 pom import diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml index 93b541ae26..8456996bb7 100644 --- a/features/features-mdsal-experimental/pom.xml +++ b/features/features-mdsal-experimental/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml index c9bd4939fb..3d365ff50f 100644 --- a/features/features-mdsal/pom.xml +++ b/features/features-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/pom.xml b/features/pom.xml index acc593b294..fd5d181b3a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 627da7584b..560c358ab9 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index b6b977d0b0..58d1c1f6cd 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/model/pom.xml b/model/pom.xml index b9132a2d32..739345fb67 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/netty/pom.xml b/netty/pom.xml index b34003aea1..61dbb42543 100644 --- a/netty/pom.xml +++ b/netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/pom.xml b/pom.xml index 0ccf8b9a6a..7c34f5318d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/replicate/pom.xml b/replicate/pom.xml index 338d96cddf..be57b3dbc4 100644 --- a/replicate/pom.xml +++ b/replicate/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml index d6f5e2da96..38764c4309 100644 --- a/singleton-service/pom.xml +++ b/singleton-service/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/trace/pom.xml b/trace/pom.xml index c92810befe..1e84d46ebc 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/yanglib/pom.xml b/yanglib/pom.xml index 36b855a939..d43de4572b 100644 --- a/yanglib/pom.xml +++ b/yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 -- 2.36.6