diff options
Diffstat (limited to 'adaptors/ansible-adapter')
| -rw-r--r-- | adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml | 29 | ||||
| -rw-r--r-- | adaptors/ansible-adapter/ansible-adapter-installer/pom.xml | 7 | ||||
| -rw-r--r-- | adaptors/ansible-adapter/pom.xml | 314 |
3 files changed, 172 insertions, 178 deletions
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml index b47eaa643..acf220396 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ============LICENSE_START======================================================= - ONAP : APPC ================================================================================ - 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. ECOMP is +<!-- ============LICENSE_START======================================================= + ONAP : APPC ================================================================================ + 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. 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -28,7 +28,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <dependencyManagement> <dependencies> @@ -60,7 +60,6 @@ <artifactId>httpclient</artifactId> </dependency> - <!-- Needed to run test cases --> <dependency> <groupId>org.glassfish.jersey.core</groupId> @@ -116,12 +115,10 @@ <artifactId>json</artifactId> </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - </dependencies> </project> diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml index f393ede76..13fe78edb 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -38,7 +38,7 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> <properties> <application.name>ccsdk-ansible-adapter</application.name> @@ -55,7 +55,6 @@ <version>${project.version}</version> </dependency> - </dependencies> <build> @@ -70,7 +69,7 @@ </goals> <phase>package</phase> <configuration> - <appendAssemblyId>true</appendAssemblyId> + <appendAssemblyId>true</appendAssemblyId> <attach>true</attach> <finalName>stage/${application.name}-${project.version}</finalName> <descriptors> @@ -85,7 +84,7 @@ </goals> <phase>package</phase> <configuration> - <appendAssemblyId>false</appendAssemblyId> + <appendAssemblyId>false</appendAssemblyId> <attach>true</attach> <finalName>${application.name}-${project.version}</finalName> <descriptors> diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index 65fd5de0c..8d8f85720 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -24,168 +24,166 @@ --> <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>odlparent-lite</artifactId> - <version>2.1.1</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adaptor</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-adaptors :: ansible-adapter</name> - <description>Abstractions to interact with Ansible server via REST</description> - - <modules> - <module>ansible-adapter-bundle</module> - <module>ansible-adapter-installer</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>ansible-adapter-features</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>ansible-adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> - - - </dependencies> - - - </dependencyManagement> - - <pluginRepositories> - <!-- Black Duck plugin dependencies --> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> + + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adaptor</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + <description>Abstractions to interact with Ansible server via REST</description> + + <modules> + <module>ansible-adapter-bundle</module> + <module>ansible-adapter-installer</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>ansible-adapter-features</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>ansible-adapter-provider</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <pluginRepositories> + <!-- Black Duck plugin dependencies --> <pluginRepository> <id>JCenter</id> <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - </pluginRepositories> - - <build> - <plugins> - - <!-- Black duck plugin Not required for regular builds - <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> - </configuration> <extensions>true</extensions> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - - </plugin> - --> - - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>4.3</version> - </additionalDependency> - </additionalDependencies> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc-no-fork</report> - <report>test-javadoc-no-fork</report> - </reports> - </reportSet> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - <report>test-aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - <reportSets> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - <report>test-aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.3</version> - <reportSets> - <reportSet> - <id>dual-report</id> - <configuration> - <type>range</type> - <range>30</range> - </configuration> - <reports> - <report>changelog</report> - <report>file-activity</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> - </plugin> - </plugins> - - </reporting> + </pluginRepositories> + + <build> + <plugins> + + <!-- Black duck plugin Not required for regular builds + <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> + </configuration> <extensions>true</extensions> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + + </plugin> + --> + + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.3</version> + </additionalDependency> + </additionalDependencies> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc-no-fork</report> + <report>test-javadoc-no-fork</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>dual-report</id> + <configuration> + <type>range</type> + <range>30</range> + </configuration> + <reports> + <report>changelog</report> + <report>file-activity</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + </plugins> + + </reporting> </project> |