From fe7eb3f60b2d83d0e6a812cab5d4ba5319bb4e18 Mon Sep 17 00:00:00 2001 From: jameshall03885 Date: Wed, 9 Apr 2014 10:30:03 -0400 Subject: [PATCH] Bug 651 - Added back IDE profile and changed target for yang sources - The IDE maven profile was added back based on feedback from Giovanni Meo - To avoid devs from having to run the IDE profile so eclipse can see the yang generated source files, the yang source files are now generated under src/main/yang-gen-sals or src/main/yang-gen-config instead of target/target-ide. - The maven-clean-plugin was moved to the commons base pom and removed from all child poms where it was specified. Thus, it will be automatically run for all projects. The plugin's execution will clean all xtend and yang generated source dirs. - The build-helper-maven-plugin was also moved to the commons base pom and removed from all child poms. It will automatically run for all projects and no longer needs to be specified in child poms. The plugin's execution will created eclipse source folders for all xtend and yang generated source. Tom P and Devin A really did all this work, Greg just gets credit unfairly. Conflicts: opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml Change-Id: I8d9e403629cab2e48d03d5c7a417a02f1d878ca7 Signed-off-by: tpantelis Signed-off-by: jameshall03885 Signed-off-by: dbavery Signed-off-by: jameshall03885 --- .gitignore | 2 + opendaylight/commons/opendaylight/pom.xml | 56 +++++++++++++++++- .../commons/protocol-framework/pom.xml | 5 -- .../resources/archetype-resources/pom.xml | 22 ------- .../config/config-plugin-parent/pom.xml | 26 -------- opendaylight/config/logback-config/pom.xml | 1 + .../config/netty-threadgroup-config/pom.xml | 2 - opendaylight/config/pom.xml | 21 ------- .../flow-management-compatibility/pom.xml | 3 - .../inventory-topology-compatibility/pom.xml | 3 - .../md-sal/forwardingrules-manager/pom.xml | 3 - opendaylight/md-sal/inventory-manager/pom.xml | 3 - opendaylight/md-sal/model/pom.xml | 18 ------ opendaylight/md-sal/pom.xml | 59 ------------------- .../md-sal/sal-binding-broker/pom.xml | 27 +-------- .../binding/impl/NotificationBrokerImpl.xtend | 2 +- .../md-sal/sal-binding-config/pom.xml | 21 +------ .../md-sal/sal-binding-dom-it/pom.xml | 3 - opendaylight/md-sal/sal-dom-api/pom.xml | 21 +------ opendaylight/md-sal/sal-dom-broker/pom.xml | 22 +------ .../md-sal/sal-netconf-connector/pom.xml | 23 +------- opendaylight/md-sal/sal-remote/pom.xml | 19 ------ .../implementation/pom.xml | 2 +- .../md-sal/sal-restconf-broker/pom.xml | 19 ------ .../md-sal/samples/l2switch/model/pom.xml | 2 +- .../md-sal/samples/toaster-consumer/pom.xml | 21 ------- .../md-sal/samples/toaster-provider/pom.xml | 20 ------- opendaylight/md-sal/samples/toaster/pom.xml | 18 ------ .../md-sal/statistics-manager/pom.xml | 3 - .../md-sal/topology-lldp-discovery/pom.xml | 23 -------- opendaylight/md-sal/topology-manager/pom.xml | 3 - .../ietf-netconf-monitoring-extension/pom.xml | 4 -- .../netconf/ietf-netconf-monitoring/pom.xml | 4 -- opendaylight/netconf/pom.xml | 19 ------ opendaylight/northbound/java-client/pom.xml | 1 - 35 files changed, 65 insertions(+), 436 deletions(-) diff --git a/.gitignore b/.gitignore index 175ab5f0a0..6fc003be27 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ opendaylight/northbound/integrationtest/logs/* *.iws .idea xtend-gen +yang-gen-config +yang-gen-sal classes out/ .externalToolBuilders diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 1e8d3d26b5..d5d7e8e5c4 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -115,7 +115,9 @@ 1.3.1 2.4.3 - ${project.build.directory}/generated-sources/xtend-gen + src/main/xtend-gen + src/main/yang-gen-config + src/main/yang-gen-sal @@ -1717,7 +1719,7 @@ true ${project.basedir} **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/ + **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/ @@ -1784,6 +1786,10 @@ + + org.codehaus.mojo + build-helper-maven-plugin + @@ -2005,6 +2011,52 @@ + + maven-clean-plugin + + + + ${xtend.dstdir} + + ** + + + + ${jmxGeneratorPath} + + ** + + + + ${salGeneratorPath} + + ** + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + add-source + generate-sources + + add-source + + + + ${jmxGeneratorPath} + ${salGeneratorPath} + ${xtend.dstdir} + + + + + diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml index 650d2dd35b..1a1a2561cc 100644 --- a/opendaylight/commons/protocol-framework/pom.xml +++ b/opendaylight/commons/protocol-framework/pom.xml @@ -25,11 +25,6 @@ 3.0.4 - - ${project.build.directory}/generated-sources/config - ${project.build.directory}/generated-sources/sal - - io.netty diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml index 21b1a5590b..80abd87262 100644 --- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -8,8 +8,6 @@ bundle - ${project.build.directory}/generated-sources/config - ${project.build.directory}/generated-sources/sal ${config-api-version} ${yang-maven-plugin-version} ${maven-bundle-plugin-version} @@ -78,26 +76,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${jmxGeneratorPath} - - - - - - org.apache.felix maven-bundle-plugin diff --git a/opendaylight/config/config-plugin-parent/pom.xml b/opendaylight/config/config-plugin-parent/pom.xml index e382c33871..2c607f81d0 100644 --- a/opendaylight/config/config-plugin-parent/pom.xml +++ b/opendaylight/config/config-plugin-parent/pom.xml @@ -14,10 +14,6 @@ 3.0.4 - - ${project.build.directory}/generated-sources/config - - @@ -56,28 +52,6 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${jmxGeneratorPath} - ${salGeneratorPath} - - - - - diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml index fbebda526a..2fe515c312 100644 --- a/opendaylight/config/logback-config/pom.xml +++ b/opendaylight/config/logback-config/pom.xml @@ -89,6 +89,7 @@ org.opendaylight.yangtools yang-maven-plugin + diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index 54143355f4..332426faa5 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -68,8 +68,6 @@ org.opendaylight.yangtools yang-maven-plugin - - org.apache.felix maven-bundle-plugin diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index d700075e95..8efed2d9f6 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -62,7 +62,6 @@ 5.0.0 0.6.2.201302030002 1.7.2 - ${project.build.directory}/generated-sources/sal @@ -305,26 +304,6 @@ - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${salGeneratorPath} - - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml index fc0ef32954..f3fd230d5b 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml @@ -30,9 +30,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml index b7e193b59d..aef489ec83 100644 --- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml @@ -31,9 +31,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - diff --git a/opendaylight/md-sal/forwardingrules-manager/pom.xml b/opendaylight/md-sal/forwardingrules-manager/pom.xml index 00cbc18e7e..68eaa96871 100644 --- a/opendaylight/md-sal/forwardingrules-manager/pom.xml +++ b/opendaylight/md-sal/forwardingrules-manager/pom.xml @@ -31,9 +31,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - diff --git a/opendaylight/md-sal/inventory-manager/pom.xml b/opendaylight/md-sal/inventory-manager/pom.xml index 362a349657..31621deeea 100644 --- a/opendaylight/md-sal/inventory-manager/pom.xml +++ b/opendaylight/md-sal/inventory-manager/pom.xml @@ -59,9 +59,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml index 4c8a74c62b..a2a526426e 100644 --- a/opendaylight/md-sal/model/pom.xml +++ b/opendaylight/md-sal/model/pom.xml @@ -91,24 +91,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - target/generated-sources/sal - - - - - diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index a45cadab7c..631f1118c5 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -86,23 +86,9 @@ - - IDE - - - m2e.version - - - - - target-ide - - - ${project.build.directory}/generated-sources/sal UTF-8 @@ -220,30 +206,6 @@ org.eclipse.xtend xtend-maven-plugin ${xtend.version} - - - - compile - - - ${basedir}/src/main/xtend-gen - - - - - - maven-clean-plugin - ${maven.clean.plugin.version} - - - - ${basedir}/src/main/xtend-gen - - ** - - - - org.jacoco @@ -311,27 +273,6 @@ org.apache.felix maven-bundle-plugin - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - ${project.build.directory}/generated-sources/sal - src/main/xtend-gen - - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index dafb3ef634..9976f48114 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -30,7 +30,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang @@ -72,28 +72,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - - - ${project.build.directory}/generated-sources/config - src/main/xtend-gen - - - - - org.apache.felix maven-bundle-plugin @@ -122,9 +100,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - org.jacoco jacoco-maven-plugin diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend index fe2681f1f7..6d675b4b5e 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend @@ -60,7 +60,7 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab override publish(Notification notification, ExecutorService service) { val allTypes = notification.notificationTypes - var Iterable> listenerToNotify = Collections.emptySet(); + var Iterable> listenerToNotify = Collections.emptySet(); for (type : allTypes) { listenerToNotify = listenerToNotify + listeners.get(type as Class) } diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index 145dc37552..f75995dc22 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -43,7 +43,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang @@ -73,25 +73,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - - - - - diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 82e3d97572..94832c14b6 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -19,9 +19,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - org.jacoco jacoco-maven-plugin diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index 15932d56ce..181fc5c0c5 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang @@ -79,25 +79,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - - - - - diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 5063e4339b..360988fbb2 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -84,7 +84,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang @@ -156,26 +156,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - src/main/xtend-gen - - - - - org.eclipse.xtend xtend-maven-plugin diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml index 182441d3f5..ae819b0f78 100644 --- a/opendaylight/md-sal/sal-netconf-connector/pom.xml +++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml @@ -204,7 +204,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang @@ -235,27 +235,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - src/main/xtend-gen - - - - - - org.eclipse.xtend xtend-maven-plugin diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml index 15bd2e7a30..0c06b4490d 100644 --- a/opendaylight/md-sal/sal-remote/pom.xml +++ b/opendaylight/md-sal/sal-remote/pom.xml @@ -64,25 +64,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/ - - - - - diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml index 415ae5aa05..0c817d26f6 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml @@ -157,7 +157,7 @@ org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${project.build.directory}/generated-sources/config + ${jmxGeneratorPath} urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml index 2fe625ffb3..c086db7ba4 100644 --- a/opendaylight/md-sal/sal-restconf-broker/pom.xml +++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml @@ -66,25 +66,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/ - - - - - diff --git a/opendaylight/md-sal/samples/l2switch/model/pom.xml b/opendaylight/md-sal/samples/l2switch/model/pom.xml index d0ef2e0c65..7c54309fa1 100644 --- a/opendaylight/md-sal/samples/l2switch/model/pom.xml +++ b/opendaylight/md-sal/samples/l2switch/model/pom.xml @@ -41,7 +41,7 @@ org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - target/generated-sources/sal + ${salGeneratorPath} diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index 67fc824a7b..0c16a92586 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -16,8 +16,6 @@ 1.1-SNAPSHOT - ${project.build.directory}/generated-sources/config - @@ -84,25 +82,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${jmxGeneratorPath} - - - - - diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index 4e4cfeda2a..11ee47b8c7 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -16,7 +16,6 @@ - ${project.build.directory}/generated-sources/config 1.1-SNAPSHOT @@ -82,25 +81,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${jmxGeneratorPath} - - - - - diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml index 59f8955d4b..eb13e64adc 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -49,24 +49,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - target/generated-sources/sal - - - - - diff --git a/opendaylight/md-sal/statistics-manager/pom.xml b/opendaylight/md-sal/statistics-manager/pom.xml index b829990bd3..9ace8a119f 100644 --- a/opendaylight/md-sal/statistics-manager/pom.xml +++ b/opendaylight/md-sal/statistics-manager/pom.xml @@ -66,9 +66,6 @@ - - maven-clean-plugin - diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml index 590e8ea91a..627934eb67 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml +++ b/opendaylight/md-sal/topology-lldp-discovery/pom.xml @@ -92,29 +92,6 @@ org.eclipse.xtend xtend-maven-plugin - - - - compile - - - ${basedir}/src/main/xtend-gen - - - - - - maven-clean-plugin - - - - ${basedir}/src/main/xtend-gen - - ** - - - - diff --git a/opendaylight/md-sal/topology-manager/pom.xml b/opendaylight/md-sal/topology-manager/pom.xml index 8035f420fb..8503864f62 100644 --- a/opendaylight/md-sal/topology-manager/pom.xml +++ b/opendaylight/md-sal/topology-manager/pom.xml @@ -68,9 +68,6 @@ org.eclipse.xtend xtend-maven-plugin - - maven-clean-plugin - diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml index 7b872db9a6..2590ad8b11 100644 --- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml +++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml @@ -31,10 +31,6 @@ org.opendaylight.yangtools yang-maven-plugin - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.felix diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml index f1e5764ca6..bd2f1cc807 100644 --- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml +++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml @@ -38,10 +38,6 @@ org.opendaylight.yangtools yang-maven-plugin - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.felix diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml index 2be64a8a98..9a71c47193 100644 --- a/opendaylight/netconf/pom.xml +++ b/opendaylight/netconf/pom.xml @@ -47,7 +47,6 @@ 5.0.0 2.4.0 1.7.2 - ${project.build.directory}/generated-sources/sal @@ -239,24 +238,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - ${salGeneratorPath} - - - - - diff --git a/opendaylight/northbound/java-client/pom.xml b/opendaylight/northbound/java-client/pom.xml index 4aa4e0328b..6de347fdde 100644 --- a/opendaylight/northbound/java-client/pom.xml +++ b/opendaylight/northbound/java-client/pom.xml @@ -127,7 +127,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 attach-artifacts -- 2.36.6