diff options
| -rw-r--r-- | appc-client/pom.xml | 6 | ||||
| -rw-r--r-- | appc-directed-graph/dg-loader/pom.xml | 2 | ||||
| -rw-r--r-- | appc-directed-graph/pom.xml | 4 | ||||
| -rwxr-xr-x | appc-outbound/appc-network-inventory-client/pom.xml | 95 | ||||
| -rw-r--r-- | pom.xml | 50 |
5 files changed, 73 insertions, 84 deletions
diff --git a/appc-client/pom.xml b/appc-client/pom.xml index 71a2420bf..0f5a239d9 100644 --- a/appc-client/pom.xml +++ b/appc-client/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Copyright (C) 2017 Amdocs
=============================================================================
@@ -18,8 +18,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -54,7 +52,7 @@ <bundle.plugin.version>2.5.0</bundle.plugin.version>
<cambria.client.version>0.0.1</cambria.client.version>
<eelf.core.version>1.0.0</eelf.core.version>
- <eelf.version>0.0.4</eelf.version>
+ <eelf.version>1.0.0</eelf.version>
<freemarker.version>2.3.23</freemarker.version>
<java.version>1.8</java.version>
<junit.version>4.12</junit.version>
diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml index 02ef801fe..03ead254f 100644 --- a/appc-directed-graph/dg-loader/pom.xml +++ b/appc-directed-graph/dg-loader/pom.xml @@ -45,7 +45,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version.source>1.8</java.version.source> <java.version.target>1.8</java.version.target> - <logback.version>1.1.1</logback.version> + <logback.version>1.2.0</logback.version> <commons.collections.version>3.2.2</commons.collections.version> <common.io.version>2.5</common.io.version> <jettison.version>1.3.7</jettison.version> diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index 345f2c8cc..e241de66a 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index bd380656f..c5059a607 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -3,70 +3,65 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> <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/maven-v4_0_0.xsd"> - <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-outbound</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <artifactId>appc-network-inventory-client</artifactId> - <name>APPC Network Inventory Client</name> - - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <logback.version>1.1.1</logback.version> - <common.collections.version>3.2.2</common.collections.version> - <common.io.version>2.5</common.io.version> - <jettison.version>1.3.7</jettison.version> - <velocity.version>1.7</velocity.version> - <jackson.version>2.3.2</jackson.version> - <snakeyaml.version>1.12</snakeyaml.version> - </properties> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.onap.appc</groupId> + <artifactId>appc-outbound</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> - <dependencyManagement> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <artifactId>appc-network-inventory-client</artifactId> + <name>APPC Network Inventory Client</name> - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-network-inventory-client-features</artifactId> - <classifier>features</classifier> - <type>xml</type> - <version>${project.version}</version> - </dependency> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <logback.version>1.2.0</logback.version> + <common.collections.version>3.2.2</common.collections.version> + <common.io.version>2.5</common.io.version> + <jettison.version>1.3.7</jettison.version> + <velocity.version>1.7</velocity.version> + <jackson.version>2.3.2</jackson.version> + <snakeyaml.version>1.12</snakeyaml.version> + </properties> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-network-inventory-client-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <modules> - <module>provider</module> - <module>features</module> - <module>installer</module> - </modules> -</project> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-network-inventory-client-features</artifactId> + <classifier>features</classifier> + <type>xml</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-network-inventory-client-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <modules> + <module>provider</module> + <module>features</module> + <module>installer</module> + </modules> +</project>
\ No newline at end of file @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ -Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -18,8 +18,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -53,8 +51,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <cdp.pal.version>1.1.25.6-oss</cdp.pal.version> <dmaap.client.version>0.2.12</dmaap.client.version> - <eelf.version>0.0.1</eelf.version> - <eelf.maven.plugin.version>0.0.1</eelf.maven.plugin.version> + <eelf.version>1.0.0</eelf.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> <cadi-version>1.3.0</cadi-version> <inno-version>1.2.11</inno-version> <dme2-version>3.1.200</dme2-version> @@ -64,7 +62,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <apache.httpcomponents.version>4.4</apache.httpcomponents.version> <commons.lang3.version>3.4</commons.lang3.version> <antlr.version>4.5.1</antlr.version> - <logback.version>1.1.1</logback.version> + <logback.version>1.2.0</logback.version> <toscalib.version>1.1.0</toscalib.version> <sdc-client.version>1.2.2</sdc-client.version> <jackson.yml.version>2.3.2</jackson.yml.version> @@ -84,7 +82,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <features.file>features.xml</features.file> <jmxGeneratorPath>target/generated-sources/yang-gen-config</jmxGeneratorPath> <!-- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> --> - + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> </properties> @@ -293,7 +291,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <artifactId>dblib-provider</artifactId> <version>${sdnctl.dblib.version}</version> </dependency> - <!-- A&AI service provider dependency override in order to use a stable + <!-- A&AI service provider dependency override in order to use a stable version --> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> @@ -357,13 +355,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>1.1.1</version> + <version>1.2.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.1.1</version> + <version>1.2.0</version> <scope>compile</scope> </dependency> <!-- <dependency> --> @@ -518,18 +516,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </plugins> </pluginManagement> <plugins> - <!--maven staging plugin --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${onap.nexus.url}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> + <!--maven staging plugin --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>${onap.nexus.url}</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> <!-- Javadocs Plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -569,10 +567,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </plugin> <!-- blackduck maven plugin --> - <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> - <version>2.0.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> - </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase> + <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> + <version>2.0.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> + </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase> <goals> <goal>build-bom</goal> </goals> </execution> </executions> </plugin> --> <!-- force Eclipse to skip the additional-install step specified in the |