diff options
Diffstat (limited to 'appc-outbound')
18 files changed, 471 insertions, 263 deletions
diff --git a/appc-outbound/appc-aai-client/features/features-appc-aai-client/.gitignore b/appc-outbound/appc-aai-client/features/features-appc-aai-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-aai-client/features/features-appc-aai-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml new file mode 100644 index 000000000..d13cf49ff --- /dev/null +++ b/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>features-appc-aai-client</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-aai-client</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> +</project> diff --git a/appc-outbound/appc-aai-client/features/onap-appc-aai-client/.gitignore b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml new file mode 100644 index 000000000..1c9c86d10 --- /dev/null +++ b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-aai-client</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>odl-mdsal-broker</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-aai-service</artifactId> + <type>xml</type> + <classifier>features</classifier> + <version>${ccsdk.sli.adaptors.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-aai-client-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <includeTransitiveDependency>false</includeTransitiveDependency> + <excludedArtifactIds> + <excludedArtifactId>slf4j-api</excludedArtifactId> + <excludedArtifactId>tomcat-jdbc</excludedArtifactId> + <excludedArtifactId>tomcat-juli</excludedArtifactId> + <excludedArtifactId>httpcore</excludedArtifactId> + <excludedArtifactId>httpclient</excludedArtifactId> + <excludedArtifactId>org.eclipse.osgi</excludedArtifactId> + + </excludedArtifactIds> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/appc-outbound/appc-aai-client/features/onap-appc-aai-client/src/main/feature/feature.xml b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/src/main/feature/feature.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + ONAP : APPC + ================================================================================ + Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + ============================================================================= + 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========================================================= + --> +<features name="onap-appc-sequence-generator" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"> + <feature name="onap-appc-sequence-generator" version="${project.version}"> + <configfile finalname="etc/opendaylight/karaf/201-appc-sequence-generator.xml"> + mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}/xml/config</configfile> + </feature> +</features>
\ No newline at end of file diff --git a/appc-outbound/appc-aai-client/features/pom.xml b/appc-outbound/appc-aai-client/features/pom.xml index d05858ad8..e29b3983a 100755..100644 --- a/appc-outbound/appc-aai-client/features/pom.xml +++ b/appc-outbound/appc-aai-client/features/pom.xml @@ -1,130 +1,42 @@ <?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. - ============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> - <parent> - <artifactId>appc-aai-client</artifactId> - <groupId>org.onap.appc</groupId> - <version>1.4.0-SNAPSHOT</version> - </parent> - <artifactId>appc-aai-client-features</artifactId> - <name>APPC AAI Client Plugin - Features</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-aai-client-provider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>features-mdsal</artifactId> - <classifier>features</classifier> - <type>xml</type> - - <scope>runtime</scope> - </dependency> - - - <!-- dependency for opendaylight-karaf-empty for use by testing --> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>opendaylight-karaf-empty</artifactId> - <type>zip</type> - </dependency> - - - <dependency> - <!-- Required for launching the feature tests --> - <groupId>org.opendaylight.odlparent</groupId> - <artifactId>features-test</artifactId> - <version>${odl.commons.opendaylight.version}</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>filter</id> - <goals> - <goal>resources</goal> - </goals> - <phase>generate-resources</phase> - </execution> - </executions> - </plugin> - <!-- launches the feature test, which validates that your karaf feature - can be installed inside of a karaf container. It doesn't validate that your - functionality works correctly, just that you have all of the dependent bundles - defined correctly. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> <configuration> <systemPropertyVariables> <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId> - <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId> - <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version> - </systemPropertyVariables> <dependenciesToScan> <dependency>org.opendaylight.yangtools:features-test</dependency> - </dependenciesToScan> </configuration> </plugin> --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <goals> - <goal>attach-artifact</goal> - </goals> - <phase>package</phase> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/classes/${features.file}</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>appc-aai-client-feature-aggregator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name></name> + + <modules> + <module>onap-appc-aai-client</module> + <module>features-appc-aai-client</module> + </modules> </project> diff --git a/appc-outbound/appc-aai-client/installer/pom.xml b/appc-outbound/appc-aai-client/installer/pom.xml index 5c2f97ed3..caddec898 100755 --- a/appc-outbound/appc-aai-client/installer/pom.xml +++ b/appc-outbound/appc-aai-client/installer/pom.xml @@ -22,11 +22,13 @@ <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> - <artifactId>appc-aai-client</artifactId> - <groupId>org.onap.appc</groupId> - <version>1.4.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + <groupId>org.onap.appc</groupId> <artifactId>appc-aai-client-installer</artifactId> <name>APPC AAI Client -Installer</name> <packaging>pom</packaging> @@ -34,7 +36,7 @@ <properties> <application.name>appc-aai-client</application.name> <features.boot>appc-aai-client</features.boot> - <features.repositories>mvn:org.onap.appc/appc-aai-client-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/onap-appc-aai-client/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> @@ -42,7 +44,7 @@ <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-aai-client-features</artifactId> + <artifactId>onap-appc-aai-client</artifactId> <version>${project.version}</version> <classifier>features</classifier> <type>xml</type> diff --git a/appc-outbound/appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/pom.xml index 4e78e2d7d..61692169f 100755 --- a/appc-outbound/appc-aai-client/pom.xml +++ b/appc-outbound/appc-aai-client/pom.xml @@ -21,11 +21,13 @@ --> <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.4.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + <groupId>org.onap.appc</groupId> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml index a908b4d5c..836e298ea 100755 --- a/appc-outbound/appc-aai-client/provider/pom.xml +++ b/appc-outbound/appc-aai-client/provider/pom.xml @@ -23,10 +23,12 @@ 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.appc</groupId>
- <artifactId>appc-aai-client</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-aai-client-provider</artifactId>
<packaging>bundle</packaging>
<name>APPC AAI Client - Provider</name>
diff --git a/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml new file mode 100644 index 000000000..5f30a14e4 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>features-appc-network-inventory-client</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-network-inventory-client</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> +</project> diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml new file mode 100644 index 000000000..21ae4e153 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-network-inventory-client</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>odl-mdsal-broker</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-config-params-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-network-inventory-client-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <includeTransitiveDependency>false</includeTransitiveDependency> + <excludedArtifactIds> + <excludedArtifactId>slf4j-api</excludedArtifactId> + <excludedArtifactId>tomcat-jdbc</excludedArtifactId> + <excludedArtifactId>tomcat-juli</excludedArtifactId> + <excludedArtifactId>httpcore</excludedArtifactId> + <excludedArtifactId>httpclient</excludedArtifactId> + <excludedArtifactId>org.eclipse.osgi</excludedArtifactId> + + </excludedArtifactIds> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + ONAP : APPC + ================================================================================ + Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + ============================================================================= + 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========================================================= + --> +<features name="onap-appc-sequence-generator" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"> + <feature name="onap-appc-sequence-generator" version="${project.version}"> + <configfile finalname="etc/opendaylight/karaf/201-appc-sequence-generator.xml"> + mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}/xml/config</configfile> + </feature> +</features>
\ No newline at end of file diff --git a/appc-outbound/appc-network-inventory-client/features/pom.xml b/appc-outbound/appc-network-inventory-client/features/pom.xml index 01bf81504..392ad32e2 100755..100644 --- a/appc-outbound/appc-network-inventory-client/features/pom.xml +++ b/appc-outbound/appc-network-inventory-client/features/pom.xml @@ -1,118 +1,42 @@ <?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. - ============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> - <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-network-inventory-client</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> - <artifactId>appc-network-inventory-client-features</artifactId> - <name>APPC Network Inventory - Features</name> - <packaging>jar</packaging> +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +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 - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-network-inventory-client-provider</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>compile</scope> - </dependency> + http://www.apache.org/licenses/LICENSE-2.0 - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>features-mdsal</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>features-yangtools</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> +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========================================================= +--> +<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.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-network-inventory-client-feature-aggregator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>pom</packaging> - </dependencies> + <name></name> - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>filter</id> - <goals> - <goal>resources</goal> - </goals> - <phase>generate-resources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <goals> - <goal>attach-artifact</goal> - </goals> - <phase>package</phase> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/classes/${features.file}</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <modules> + <module>onap-appc-network-inventory-client</module> + <module>features-appc-network-inventory-client</module> + </modules> </project> diff --git a/appc-outbound/appc-network-inventory-client/installer/pom.xml b/appc-outbound/appc-network-inventory-client/installer/pom.xml index ecc06655e..3ea006f26 100755 --- a/appc-outbound/appc-network-inventory-client/installer/pom.xml +++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml @@ -22,26 +22,29 @@ <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> - <artifactId>appc-network-inventory-client</artifactId> - <groupId>org.onap.appc</groupId> - <version>1.4.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + <groupId>org.onap.appc</groupId> <name>APPC Network Inventory - Installer</name> <packaging>pom</packaging> <properties> <application.name>appc-network-inventory-client</application.name> <features.boot>appc-network-inventory-client</features.boot> - <features.repositories>mvn:org.onap.appc/appc-network-inventory-client-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/onap-appc-network-inventory-client/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-network-inventory-client-features</artifactId> + <artifactId>onap-appc-network-inventory-client</artifactId> <classifier>features</classifier> + <version>${project.version}</version> <type>xml</type> <exclusions> <exclusion> @@ -53,6 +56,7 @@ <dependency> <groupId>org.onap.appc</groupId> <artifactId>appc-network-inventory-client-provider</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index f11a40701..8fc224575 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -22,10 +22,12 @@ <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> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.appc</groupId> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index 17ff19843..e2edfbac2 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -25,11 +25,13 @@ 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>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-network-inventory-client</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
<artifactId>appc-network-inventory-client-provider</artifactId>
<version>1.4.0-SNAPSHOT</version>
|