Fix metainf-services integration

This got broken by explicit annotation processor paths, hence it
is not a seamless upgrade. Add the processor to paths, so downstreams
can upgrade easily.

JIRA: ODLPARENT-216
Change-Id: Id4ebbf41f2a094c9b5fc52315f5a138d6f04a909
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/docs/NEWS.rst b/docs/NEWS.rst
index 227bbfa5c5433db8f677528460e4c6f33ae2df2d..324676ea964e4a8e480b083e1670c56adc9894a0 100644 (file)
--- a/docs/NEWS.rst
+++ b/docs/NEWS.rst
@@ -2,6 +2,16 @@
 ODL Parent release notes
 ========================
 
+Version 6.0.3
+-------------
+This is a bug-fix upgrade from version 6.0.2.
+
+Bug fixes
+~~~~~~~~~
+* The fix for `ODLPARENT-216 <https://jira.opendaylight.org/browse/ODLPARENT-216>`__ ended up
+  breaking ``org.kohsuke.metainf-services`` integration. While this could be fixed in downstreams
+  by adding proper </annotationProcessorPaths> entry, it is a regression from 6.0.1.
+
 Version 6.0.2
 -------------
 This is a security/bug-fix upgrade from version 6.0.1.

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 0b9e59d8d16052be5703eb706f291ebb24906990..1399bd3ec7738c4058ae667d519eb029bbe56c68 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -260,6 +260,7 @@
         <!-- Generates META-INF/services entries for ServiceLoader -->
         <groupId>org.kohsuke.metainf-services</groupId>
         <artifactId>metainf-services</artifactId>
+        <!-- Keep this version in sync with annotationProcessorPaths declaration below -->
         <version>1.8</version>
         <optional>true</optional>
         <scope>provided</scope>
@@ -1323,6 +1324,12 @@
                 <!-- Keep this version in sync with dependency declaration above -->
                 <version>2.7.5</version>
               </dependency>
+              <dependency>
+                <groupId>org.kohsuke.metainf-services</groupId>
+                <artifactId>metainf-services</artifactId>
+                <!-- Keep this version in sync with dependency declaration above -->
+                <version>1.8</version>
+              </dependency>
             </annotationProcessorPaths>
           </configuration>
         </plugin>