diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-08-10 15:14:38 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-08-14 00:24:43 +0000 |
| commit | d3ef54773c1fcda598e7f67110233f735e097da9 (patch) | |
| tree | 60130527f3b2c6594297d3f719670fa85748f54e /appc-sequence-generator | |
| parent | 2108e888726999712b8edc7319e06765a9c51821 (diff) | |
Karaf 4 for 2 features
appc-ansible-adaptor and appc-sequence-generator
Change-Id: I1f2e8727f899486df84c75350737a7a91bbb1039
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1142
Diffstat (limited to 'appc-sequence-generator')
13 files changed, 232 insertions, 164 deletions
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore b/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml index 3957010e9..f2edf82aa 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml @@ -25,11 +25,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <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-sequence-generator</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> <artifactId>appc-sequence-generator-bundle</artifactId> <name>appc-sequence-generator-bundle</name> <packaging>bundle</packaging> diff --git a/appc-sequence-generator/appc-sequence-generator-features/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml new file mode 100644 index 000000000..dacd45f86 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/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-sequence-generator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-sequence-generator</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> +</project> diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml new file mode 100644 index 000000000..fbf33ff1e --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml @@ -0,0 +1,90 @@ +<?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-sequence-generator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-core</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>domain-model-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-sequence-generator-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-dg-domain-model-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-dg-dependency-model</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-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/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-sequence-generator/appc-sequence-generator-features/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/pom.xml index 861517783..dcfb6360c 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/pom.xml @@ -1,151 +1,42 @@ -<?xml version="1.0"?> +<?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 +============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========================================================= +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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> +<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-sequence-generator</artifactId> + <artifactId>appc-sequence-generator-feature-aggregator</artifactId> <version>1.4.0-SNAPSHOT</version> - </parent> - <artifactId>appc-sequence-generator-features</artifactId> - <name>Application Controller Sequence Generator Features</name> - - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-sequence-generator-bundle</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-sequence-generator-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>features-mdsal</artifactId> - <classifier>features</classifier> - <type>xml</type> + <packaging>pom</packaging> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>features-yangtools</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dg-domain-model-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dg-dependency-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> - <version>${project.version}</version> - </dependency> - </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> - <!– 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. –> - <!– Skipping ODL feature test –> - <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> - <classpathDependencyExcludes> - <!– The dependencies which bring in AbstractDataBrokerTest class brings - in a second PaxExam container which results in the feature tests failing - with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous - TestContainer ..." This excludes the container we don't want to use. –> - <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes> - </classpathDependencyExcludes> - <skipTests>true</skipTests> - </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> + <modules> + <module>onap-appc-sequence-generator</module> + <module>features-appc-sequence-generator</module> + </modules> </project> diff --git a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml index c118fd09b..0f73e25ab 100644 --- a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml @@ -24,11 +24,13 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-sequence-generator</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> <artifactId>appc-sequence-generator-installer</artifactId> <name>Appc Sequence Generator : Karaf Installer</name> <packaging>pom</packaging> @@ -36,15 +38,16 @@ <properties> <application.name>appc-sequence-generator</application.name> <features.boot>appc-sequence-generator</features.boot> - <features.repositories>mvn:org.onap.appc/appc-sequence-generator-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/onap-appc-sequence-generator/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> + <feature-name>appc-sequence-generator</feature-name> </properties> <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-sequence-generator-features</artifactId> + <artifactId>onap-appc-sequence-generator</artifactId> <version>${project.version}</version> <classifier>features</classifier> <type>xml</type> diff --git a/appc-sequence-generator/appc-sequence-generator-model/.gitignore b/appc-sequence-generator/appc-sequence-generator-model/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-model/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-model/pom.xml b/appc-sequence-generator/appc-sequence-generator-model/pom.xml index 4113b3e2e..f89c102d2 100644 --- a/appc-sequence-generator/appc-sequence-generator-model/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-model/pom.xml @@ -24,11 +24,13 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-sequence-generator</artifactId> - <version>1.4.0-SNAPSHOT</version> - </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-sequence-generator-model</artifactId> <name>appc-sequence-generator-model</name> <packaging>bundle</packaging> diff --git a/appc-sequence-generator/pom.xml b/appc-sequence-generator/pom.xml index 9bcaeb49d..522a4a2dd 100644 --- a/appc-sequence-generator/pom.xml +++ b/appc-sequence-generator/pom.xml @@ -23,12 +23,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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc</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> <artifactId>appc-sequence-generator</artifactId> <name>appc-sequence-generator</name> @@ -65,4 +65,4 @@ <module>appc-sequence-generator-features</module> <module>appc-sequence-generator-installer</module> </modules> -</project>
\ No newline at end of file +</project> |