diff options
Diffstat (limited to 'a1-adapter')
| -rw-r--r-- | a1-adapter/a1-adapter-api/feature/pom.xml | 3 | ||||
| -rw-r--r-- | a1-adapter/a1-adapter-api/installer/pom.xml | 4 | ||||
| -rw-r--r-- | a1-adapter/a1-adapter-api/model/pom.xml | 116 | ||||
| -rw-r--r-- | a1-adapter/a1-adapter-api/pom.xml | 68 | ||||
| -rw-r--r-- | a1-adapter/a1-adapter-api/provider/pom.xml | 19 | ||||
| -rw-r--r-- | a1-adapter/features/a1-adapter-northbound/pom.xml | 19 | ||||
| -rw-r--r-- | a1-adapter/features/installer/pom.xml | 59 | ||||
| -rw-r--r-- | a1-adapter/features/pom.xml | 27 | ||||
| -rw-r--r-- | a1-adapter/pom.xml | 16 |
9 files changed, 177 insertions, 154 deletions
diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml index cc4c681e..9c7c4a63 100644 --- a/a1-adapter/a1-adapter-api/feature/pom.xml +++ b/a1-adapter/a1-adapter-api/feature/pom.xml @@ -19,6 +19,7 @@ ~ ============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> @@ -37,12 +38,10 @@ <name>ccsdk-oran :: ${project.artifactId}</name> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>a1-adapter-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project>
\ No newline at end of file diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml index 2e55f7d1..d7d944bf 100644 --- a/a1-adapter/a1-adapter-api/installer/pom.xml +++ b/a1-adapter/a1-adapter-api/installer/pom.xml @@ -19,6 +19,7 @@ ~ ============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> @@ -42,7 +43,6 @@ </properties> <dependencies> - <dependency> <groupId>org.onap.ccsdk.oran</groupId> <artifactId>${application.name}-feature</artifactId> @@ -56,13 +56,11 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>a1-adapter-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml index 7aa386e5..34ad93d8 100644 --- a/a1-adapter/a1-adapter-api/model/pom.xml +++ b/a1-adapter/a1-adapter-api/model/pom.xml @@ -19,60 +19,66 @@ ~ ============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.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.0.1-SNAPSHOT</version> - <relativePath /> - </parent> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>a1-adapter-model</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>bundle</packaging> - <name>ccsdk-oran :: ${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> - <artifactId>rfc6991</artifactId> - </dependency> - </dependencies> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> - <goals> - <goal>set-system-properties</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>8</source> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.0.1-SNAPSHOT</version> + <relativePath/> + </parent> + + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-model</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>bundle</packaging> + + <name>ccsdk-oran :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991</artifactId> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <versionRange>[1.0.0,)</versionRange> + <goals> + <goal>set-system-properties</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>8</source> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project>
\ No newline at end of file diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml index c1176eb2..3ec20c35 100644 --- a/a1-adapter/a1-adapter-api/pom.xml +++ b/a1-adapter/a1-adapter-api/pom.xml @@ -19,36 +19,42 @@ ~ ============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.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.1-SNAPSHOT</version> - <relativePath /> - </parent> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>a1-adapter-api</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>ccsdk-oran :: ${project.artifactId}</name> - <properties> - <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> - </properties> - <modules> - <module>model</module> - <module>provider</module> - <module>feature</module> - <module>installer</module> - </modules> - <build> - <plugins> - <!-- support sonar in multi-module project --> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>${sonar-maven-plugin.version}</version> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.0.1-SNAPSHOT</version> + <relativePath/> + </parent> + + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-api</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-oran :: ${project.artifactId}</name> + + <properties> + <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> + </properties> + + <modules> + <module>model</module> + <module>provider</module> + <module>feature</module> + <module>installer</module> + </modules> + + <build> + <plugins> + <!-- support sonar in multi-module project --> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>${sonar-maven-plugin.version}</version> + </plugin> + </plugins> + </build> </project>
\ No newline at end of file diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml index da7933f4..f1cb7401 100644 --- a/a1-adapter/a1-adapter-api/provider/pom.xml +++ b/a1-adapter/a1-adapter-api/provider/pom.xml @@ -36,8 +36,9 @@ <packaging>bundle</packaging> <name>ccsdk-oran :: ${project.artifactId}</name> + <properties> - <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> + <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> </properties> <dependencyManagement> @@ -49,7 +50,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> @@ -57,9 +57,9 @@ <type>pom</type> <scope>import</scope> </dependency> - </dependencies> </dependencyManagement> + <dependencies> <dependency> <groupId>org.onap.ccsdk.oran</groupId> @@ -107,7 +107,6 @@ <artifactId>utils-provider</artifactId> <!-- <version>${sdnctl.sli.version}</version> --> </dependency> - </dependencies> <build> @@ -138,12 +137,12 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>8</source> - </configuration> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>8</source> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml index 57d82cc2..a0ee8260 100644 --- a/a1-adapter/features/a1-adapter-northbound/pom.xml +++ b/a1-adapter/features/a1-adapter-northbound/pom.xml @@ -19,27 +19,30 @@ ~ ============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> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.0.1-SNAPSHOT</version> <relativePath/> - </parent> + </parent> <groupId>org.onap.ccsdk.oran</groupId> <artifactId>a1-adapter-northbound</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>feature</packaging> + <name>ccsdk-oran :: ${project.artifactId}</name> + <dependencies> - <dependency> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>a1-adapter-feature</artifactId> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-feature</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> - </dependency> - </dependencies> + </dependency> + </dependencies> </project>
\ No newline at end of file diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml index f83849ee..230a5f91 100644 --- a/a1-adapter/features/installer/pom.xml +++ b/a1-adapter/features/installer/pom.xml @@ -19,47 +19,48 @@ ~ ============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> + <modelVersion>4.0.0</modelVersion> - <parent> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.0.1-SNAPSHOT</version> <relativePath/> </parent> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>a1-adapter-northbound-installer</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-northbound-installer</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-oran :: ${project.artifactId}</name> + <name>ccsdk-oran :: ${project.artifactId}</name> - <properties> - <application.name>a1-adapter-northbound</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.ccsdk.oran/${features.boot}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>a1-adapter-northbound</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.ccsdk.oran/${features.boot}/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>${application.name}</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>${application.name}</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - <build> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml index 5efa09c7..18efc2b9 100644 --- a/a1-adapter/features/pom.xml +++ b/a1-adapter/features/pom.xml @@ -19,24 +19,25 @@ ~ ============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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.0.1-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.0.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.oran</groupId> - <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-oran :: ${project.artifactId}</name> + <name>ccsdk-oran :: ${project.artifactId}</name> - <modules> + <modules> <module>a1-adapter-northbound</module> <module>installer</module> </modules> diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml index c3ecfe9d..83532721 100644 --- a/a1-adapter/pom.xml +++ b/a1-adapter/pom.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran @@ -18,17 +19,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> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.0.1-SNAPSHOT</version> + <relativePath/> + </parent> + <groupId>org.onap.ccsdk.oran</groupId> <artifactId>ccsdk-a1-adapter</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-oran :: ${project.artifactId}</name> + <modules> - <module>a1-adapter-api</module> - <module>features</module> - </modules> + <module>a1-adapter-api</module> + <module>features</module> + </modules> </project>
\ No newline at end of file |