diff options
author | 2019-12-12 15:24:53 -0500 | |
---|---|---|
committer | 2019-12-16 15:42:48 -0500 | |
commit | df195945d03dec122666e8d48e4c7ba94630468a (patch) | |
tree | b82f3f19c720cc47789bd158d7c1e4b730109014 /sdnr/wt/data-provider/database | |
parent | 6da38e9544f5eadc39ba3cf9f28183a6dac79f9c (diff) |
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) <ks220y@att.com>
Diffstat (limited to 'sdnr/wt/data-provider/database')
-rw-r--r-- | sdnr/wt/data-provider/database/pom.xml | 283 |
1 files changed, 142 insertions, 141 deletions
diff --git a/sdnr/wt/data-provider/database/pom.xml b/sdnr/wt/data-provider/database/pom.xml index ce4b29152..d8812e4ea 100644 --- a/sdnr/wt/data-provider/database/pom.xml +++ b/sdnr/wt/data-provider/database/pom.xml @@ -21,149 +21,150 @@ * ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-data-provider-database</artifactId> - <version>0.7.0-SNAPSHOT</version> - <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> - <packaging>bundle</packaging> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath /> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath/> + </parent> - <properties> - <maven.javadoc.skip>true</maven.javadoc.skip> - <databaseport>49401</databaseport> - </properties> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-data-provider-database</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>bundle</packaging> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> + <name>ccsdk-features :: ${project.artifactId}</name> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> - <dependencies> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-netconf-connector</artifactId> - <scope>provided</scope> - </dependency> -<!-- <dependency> --> -<!-- <groupId>org.json</groupId> --> -<!-- <artifactId>json</artifactId> --> -<!-- <scope>provided</scope> --> -<!-- </dependency> --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-data-provider-model</artifactId> - <version>${project.version}</version> - </dependency> -<!-- <dependency> --> -<!-- <groupId>org.elasticsearch.client</groupId> --> -<!-- <artifactId>elasticsearch-rest-client</artifactId> --> -<!-- <version>6.4.3</version> --> -<!-- </dependency> --> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/gen/**</exclude> - <exclude>**/generated-sources/**</exclude> - <exclude>**/yang-gen-sal/**</exclude> - <exclude>**/pax/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generateDTOs</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <skip>${skipTests}</skip> - <executable>${basedir}/src/main/resources/es-init.sh</executable> - <arguments> - <argument>initfile</argument> - <argument>-f</argument> - <argument>${project.build.directory}/EsInit.script</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.github.alexcojocaru</groupId> - <artifactId>elasticsearch-maven-plugin</artifactId> - <version>6.16</version> - <configuration> - <skip>${skipTests}</skip> - <clusterName>testCluster</clusterName> - <transportPort>9500</transportPort> - <httpPort>${databaseport}</httpPort> - <version>6.4.3</version> - <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript> - </configuration> - <executions> - <execution> - <id>start-elasticsearch</id> - <phase>process-test-classes</phase> - <goals> - <goal>runforked</goal> - </goals> - </execution> - <execution> - <id>stop-elasticsearch</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>databaseport</name> - <value>${databaseport}</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <databaseport>49401</databaseport> + </properties> + + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.opendaylight.netconf</groupId> + <artifactId>sal-netconf-connector</artifactId> + <scope>provided</scope> + </dependency> + <!-- <dependency> --> + <!-- <groupId>org.json</groupId> --> + <!-- <artifactId>json</artifactId> --> + <!-- <scope>provided</scope> --> + <!-- </dependency> --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-data-provider-model</artifactId> + <version>${project.version}</version> + </dependency> + <!-- <dependency> --> + <!-- <groupId>org.elasticsearch.client</groupId> --> + <!-- <artifactId>elasticsearch-rest-client</artifactId> --> + <!-- <version>6.4.3</version> --> + <!-- </dependency> --> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/gen/**</exclude> + <exclude>**/generated-sources/**</exclude> + <exclude>**/yang-gen-sal/**</exclude> + <exclude>**/pax/**</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generateDTOs</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>bash</executable> + <arguments> + <argument>${basedir}/src/main/resources/es-init.sh</argument> + <argument>initfile</argument> + <argument>-f</argument> + <argument>${project.build.directory}/EsInit.script</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.alexcojocaru</groupId> + <artifactId>elasticsearch-maven-plugin</artifactId> + <version>6.16</version> + <configuration> + <clusterName>testCluster</clusterName> + <transportPort>9500</transportPort> + <httpPort>${databaseport}</httpPort> + <version>6.5.0</version> + <timeout>120</timeout> + <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript> + <skip>${skipTests}</skip> + </configuration> + <executions> + <execution> + <id>start-elasticsearch</id> + <phase>process-test-classes</phase> + <goals> + <goal>runforked</goal> + </goals> + </execution> + <execution> + <id>stop-elasticsearch</id> + <phase>prepare-package</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>databaseport</name> + <value>${databaseport}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> </project> |