diff options
Diffstat (limited to 'sdnr')
5 files changed, 116 insertions, 153 deletions
diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index a67478c5c..36e62eb8c 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -73,72 +73,6 @@ <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-devicemanager-provider</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.elasticsearch</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.elasticsearch.plugin</groupId> - <artifactId>delete-by-query</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.twitter</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.hdrhistogram</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.tdunning</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.ning</groupId> - <artifactId>compress-lzf</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta-regexp</groupId> - <artifactId>jakarta-regexp</artifactId> - </exclusion> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - <exclusion> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </exclusion> - <exclusion> - <groupId>com.carrotsearch</groupId> - <artifactId>hppc</artifactId> - </exclusion> - <exclusion> - <groupId>com.spatial4j</groupId> - <artifactId>spatial4j</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 501a53182..280d00718 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -122,191 +122,229 @@ <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> <version>2.2.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.spatial4j</groupId> <artifactId>spatial4j</artifactId> <version>0.5</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.elasticsearch</groupId> <artifactId>securesm</artifactId> <version>1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.carrotsearch</groupId> <artifactId>hppc</artifactId> <version>0.7.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.8.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.joda</groupId> <artifactId>joda-convert</artifactId> <version>1.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-smile</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-cbor</artifactId> <version>2.6.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> <version>1.15</version> + <scope>provided</scope> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.10.5.Final</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>io.netty</groupId> --> +<!-- <artifactId>netty</artifactId> --> +<!-- <version>3.10.5.Final</version> --> +<!-- <scope>provided</scope> --> +<!-- </dependency> --> <dependency> <groupId>com.ning</groupId> <artifactId>compress-lzf</artifactId> <version>1.0.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.tdunning</groupId> <artifactId>t-digest</artifactId> <version>3.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> <version>2.1.6</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>jsr166e</artifactId> <version>1.1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-backward-codecs</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-queries</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-highlighter</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-queryparser</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-sandbox</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-suggest</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-misc</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-join</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-grouping</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spatial</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spatial3d</artifactId> <version>5.4.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>jakarta-regexp</groupId> <artifactId>jakarta-regexp</artifactId> <version>1.4</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.3.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>3.4</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.elasticsearch.plugin</groupId> <artifactId>delete-by-query</artifactId> <version>2.2.0</version> + <scope>provided</scope> </dependency> </dependencies> <build> @@ -321,35 +359,6 @@ <!-- </resource> --> </resources> <plugins> -<!-- <plugin> --> -<!-- <groupId>org.apache.maven.plugins</groupId> --> -<!-- <artifactId>maven-dependency-plugin</artifactId> --> -<!-- <executions> --> -<!-- <execution> --> -<!-- <id>copy-plugin</id> --> -<!-- <phase>generate-sources</phase> --> -<!-- <goals> --> -<!-- <goal>copy</goal> --> -<!-- </goals> --> -<!-- <configuration> --> -<!-- <artifactItems> --> -<!-- <artifactItem> --> -<!-- <groupId>org.elasticsearch.plugin</groupId> --> -<!-- <artifactId>delete-by-query</artifactId> --> -<!-- <version>2.2.0</version> --> -<!-- <type>jar</type> --> -<!-- <overWrite>true</overWrite> --> -<!-- <outputDirectory>${project.build.directory}/plugins/delete-by-query</outputDirectory> --> -<!-- </artifactItem> --> -<!-- </artifactItems> --> -<!-- <includes>**/*</includes> --> -<!-- <overWriteReleases>true</overWriteReleases> --> -<!-- <overWriteSnapshots>true</overWriteSnapshots> --> -<!-- <excludeTransitive>true</excludeTransitive> --> -<!-- </configuration> --> -<!-- </execution> --> -<!-- </executions> --> -<!-- </plugin> --> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java index edd9d4968..330ff8df0 100644 --- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java +++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java @@ -230,7 +230,7 @@ public class Resources { srcFilename = srcUrl.getFile(); if (srcFilename.endsWith("/")) { - LOG.warn("Skip directory: {}", srcFilename); + LOG.debug("Skip directory: {}", srcFilename); continue; } diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 4f3b1d32e..3ae834dc1 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -19,7 +19,8 @@ * limitations under the License. * ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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> @@ -38,39 +39,79 @@ <properties> <application.name>sdnr-wt-feature-aggregator</application.name> - <include.transitive.dependencies>false</include.transitive.dependencies> + <include.transitive.dependencies>true</include.transitive.dependencies> + <ccsdk.features.version>${project.version}</ccsdk.features.version> </properties> <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>${application.name}</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> +<!-- <exclusions> --> +<!-- <exclusion> --> +<!-- <groupId>*</groupId> --> +<!-- <artifactId>*</artifactId> --> +<!-- </exclusion> --> +<!-- </exclusions> --> </dependency> </dependencies> <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>maven-repo-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>stage/${application.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> +<!-- <execution> --> +<!-- <id>copy-dependencies</id> --> +<!-- <goals> --> +<!-- <goal>copy-dependencies</goal> --> +<!-- </goals> --> +<!-- <phase>prepare-package</phase> --> +<!-- <configuration> --> +<!-- <transitive>false</transitive> --> +<!-- <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> --> +<!-- <overWriteReleases>false</overWriteReleases> --> +<!-- <overWriteSnapshots>true</overWriteSnapshots> --> +<!-- <overWriteIfNewer>true</overWriteIfNewer> --> +<!-- <useRepositoryLayout>true</useRepositoryLayout> --> +<!-- <addParentPoms>false</addParentPoms> --> +<!-- <copyPom>false</copyPom> --> +<!-- <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> --> +<!-- <scope>provided</scope> --> +<!-- </configuration> --> +<!-- </execution> --> <execution> - <id>copy-dependencies</id> + <id>copy-nested-dependencies</id> <goals> <goal>copy-dependencies</goal> </goals> <phase>prepare-package</phase> <configuration> - <transitive>false</transitive> + <transitive>true</transitive> <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -78,32 +119,11 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>${project.groupId}</includeGroupIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>maven-repo-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>stage/${application.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> </executions> </plugin> </plugins> </build> + </project> diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index 6619d9004..55bfa7271 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -20,26 +20,26 @@ * ============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> + 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-feature-aggregator-top</artifactId> - <version>0.4.1-SNAPSHOT</version> - <packaging>pom</packaging> - <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-top</artifactId> + <version>0.4.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>1.2.1-SNAPSHOT</version> - <relativePath /> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.2.1-SNAPSHOT</version> + <relativePath /> + </parent> - <modules> - <module>feature</module> - <module>installer</module> - </modules> + <modules> + <module>feature</module> + <module>installer</module> + </modules> </project> |