From df195945d03dec122666e8d48e4c7ba94630468a Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 12 Dec 2019 15:24:53 -0500 Subject: Refactoring multiple plugins Refactoring below plugins in sdnr/wt/common/pom.xml : 1) org.codehaus.mojo : exec-maven-plugin -> changing executable to bash so that it can run on windows too 2) com.github.alexcojocaru : elasticsearch-maven-plugin -> skip if tests are skipped during maven build Adding create dir step in es-intit.sh : sdnr/wt/data-provider/database/src/main/resources/es-init.sh -> cmd_initfile() -> mkdir -p $( dirname $INITFILENAME ) Change-Id: I78516406101659f802dad2fb68ca349f63a4dd2e Issue-ID: CCSDK-1994 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/websocketmanager2/feature/pom.xml | 68 ++++---- sdnr/wt/websocketmanager2/installer/pom.xml | 205 +++++++++++------------ sdnr/wt/websocketmanager2/model/pom.xml | 27 +-- sdnr/wt/websocketmanager2/pom.xml | 42 ++--- sdnr/wt/websocketmanager2/provider/pom.xml | 244 ++++++++++++++-------------- 5 files changed, 297 insertions(+), 289 deletions(-) (limited to 'sdnr/wt/websocketmanager2') diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index f7c33dd0a..c0023aa0b 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -22,43 +22,43 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-feature + 0.7.0-SNAPSHOT + feature - + ccsdk-features :: ${project.artifactId} + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + ${project.groupId} + sdnr-wt-websocketmanager2-provider + ${project.version} + - - - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - ${project.groupId} - sdnr-wt-websocketmanager2-provider - ${project.version} - - diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index e363be323..b17065a89 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -22,111 +22,112 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - false - + ccsdk-features :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + sdnr-wt-websocketmanager2 + false + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index fed8b2e54..2d04ad1bb 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -22,16 +22,19 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - 0.7.0-SNAPSHOT - bundle - ccsdk-features-sdnr-wt :: ${project.artifactId} - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + 0.7.0-SNAPSHOT + bundle + + ccsdk-features :: ${project.artifactId} diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index f02ce1177..f6fec3c43 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -22,30 +22,30 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-top + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - + ccsdk-features :: ${project.artifactId} - - model - provider - feature - installer - + + model + provider + feature + installer + + + sdnr-wt-websocketmanager2 + diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 11d212f3f..894be09e9 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -11,116 +11,120 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - true - true - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - - - - - - - - - + 4.0.0 - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - javax.servlet - servlet-api - - - org.eclipse.jetty.websocket - websocket-api - - - org.eclipse.jetty.websocket - websocket-servlet - - - io.netty - netty-transport - - - io.netty - netty-all + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-provider + 0.7.0-SNAPSHOT + bundle + + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + true + true + + + + + + + + + + + + + + + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + javax.servlet + servlet-api + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-servlet + + + io.netty + netty-transport + + + io.netty + netty-all - - - org.json - json - - - com.typesafe.akka - akka-actor_2.12 - - - com.typesafe.akka - akka-cluster_2.12 - - - org.java-websocket - Java-WebSocket - - - org.mockito - mockito-core + + + org.json + json + + + com.typesafe.akka + akka-actor_2.12 + + + com.typesafe.akka + akka-cluster_2.12 + + + org.java-websocket + Java-WebSocket + + + org.mockito + mockito-core - test - - - org.opendaylight.controller - sal-binding-api - - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - - - - + test + + + org.opendaylight.controller + sal-binding-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + + + + @@ -133,18 +137,18 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + -- cgit 1.2.3-korg