diff options
| -rw-r--r-- | features/ccsdk-sli-adaptors-all/pom.xml | 2 | ||||
| -rwxr-xr-x | message-router/pom.xml | 4 | ||||
| -rwxr-xr-x | message-router/publisher/api/pom.xml | 4 | ||||
| -rwxr-xr-x | message-router/publisher/features/pom.xml | 2 | ||||
| -rwxr-xr-x | message-router/publisher/features/src/main/feature/feature.xml | 6 | ||||
| -rw-r--r-- | message-router/publisher/installer/pom.xml | 208 | ||||
| -rwxr-xr-x | message-router/publisher/pom.xml | 4 | ||||
| -rwxr-xr-x | message-router/publisher/provider/pom.xml | 6 | ||||
| -rwxr-xr-x | message-router/publisher/sample.client/pom.xml | 6 |
9 files changed, 122 insertions, 120 deletions
diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index acb33c021..d54c54e32 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -80,7 +80,7 @@ <classifier>features</classifier> </dependency> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}.messagerouter</groupId> <artifactId>publisher.features</artifactId> <version>${project.version}</version> <type>xml</type> diff --git a/message-router/pom.xml b/message-router/pom.xml index 5265eb89e..b5cd01348 100755 --- a/message-router/pom.xml +++ b/message-router/pom.xml @@ -9,8 +9,8 @@ <relativePath/> </parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> - <artifactId>parent</artifactId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>messagerouter-root</artifactId> <version>0.4.1-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml index ef03f7fd0..54ff76ec0 100755 --- a/message-router/publisher/api/pom.xml +++ b/message-router/publisher/api/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> <version>0.4.1-SNAPSHOT</version> </parent> @@ -18,7 +18,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Export-Package>org.onap.ccsdk.messagerouter.publisher.api</Export-Package> + <Export-Package>org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api</Export-Package> </instructions> </configuration> </plugin> diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml index 33a19b8c1..c91fe61f2 100755 --- a/message-router/publisher/features/pom.xml +++ b/message-router/publisher/features/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> <version>0.4.1-SNAPSHOT</version> </parent> diff --git a/message-router/publisher/features/src/main/feature/feature.xml b/message-router/publisher/features/src/main/feature/feature.xml index f5e9bb6ee..b53323572 100755 --- a/message-router/publisher/features/src/main/feature/feature.xml +++ b/message-router/publisher/features/src/main/feature/feature.xml @@ -5,12 +5,12 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <feature name='messagerouter-publisher' description="exposes message router publisher service" version='${project.version}'> - <bundle>mvn:org.onap.ccsdk.messagerouter/publisher.api/${project.version}</bundle> - <bundle>mvn:org.onap.ccsdk.messagerouter/publisher.provider/${project.version}</bundle> + <bundle>mvn:${project.groupId}/publisher.api/${project.version}</bundle> + <bundle>mvn:${project.groupId}/publisher.provider/${project.version}</bundle> </feature> <feature name='sample-client' description="initializes a dummy client" version='${project.version}'> - <bundle>mvn:org.onap.ccsdk.messagerouter/sample.client/${project.version}</bundle> + <bundle>mvn:${project.groupId}/sample.client/${project.version}</bundle> </feature> </features> diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml index 1e900805a..4e5abe5b5 100644 --- a/message-router/publisher/installer/pom.xml +++ b/message-router/publisher/installer/pom.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> +<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.messagerouter</groupId> - <artifactId>publisher.aggregate</artifactId> - <version>0.4.1-SNAPSHOT</version> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.aggregate</artifactId> + <version>0.4.1-SNAPSHOT</version> </parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> - <artifactId>publisher.installer</artifactId> - <version>0.4.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>publisher.installer</artifactId> + <version>0.4.1-SNAPSHOT</version> + <packaging>pom</packaging> <properties> <application.name>messagerouter-publisher</application.name> @@ -22,119 +24,119 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>publisher.features</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>publisher.api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>publisher.provider</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sample.client</artifactId> <version>${project.version}</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>maven-repo-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>stage/${application.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>installer-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>${application.name}-${project.version}-installer</finalName> - <descriptors> - <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transitive>false</transitive> - <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <useRepositoryLayout>true</useRepositoryLayout> - <addParentPoms>false</addParentPoms> - <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.messagerouter</includeGroupIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/scripts</directory> - <includes> - <include>install-feature.sh</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>maven-repo-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>stage/${application.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>installer-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>${application.name}-${project.version}-installer</finalName> + <descriptors> + <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transitive>false</transitive> + <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <useRepositoryLayout>true</useRepositoryLayout> + <addParentPoms>false</addParentPoms> + <copyPom>false</copyPom> + <includeGroupIds>${project.groupId}</includeGroupIds> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/scripts</directory> + <includes> + <include>install-feature.sh</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> - </executions> - </plugin> + </executions> + </plugin> - </plugins> - </build> + </plugins> + </build> </project> diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml index eded68fde..adaa3de10 100755 --- a/message-router/publisher/pom.xml +++ b/message-router/publisher/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> - <artifactId>parent</artifactId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> + <artifactId>messagerouter-root</artifactId> <version>0.4.1-SNAPSHOT</version> </parent> diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml index ca51aea42..6afe9bd37 100755 --- a/message-router/publisher/provider/pom.xml +++ b/message-router/publisher/provider/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> <version>0.4.1-SNAPSHOT</version> </parent> @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>publisher.api</artifactId> <version>${project.version}</version> </dependency> @@ -30,7 +30,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Private-Package>org.onap.ccsdk.messagerouter.publisher.provider.impl</Private-Package> + <Private-Package>${project.groupId}.publisher.provider.impl</Private-Package> </instructions> </configuration> </plugin> diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml index a264bff13..04e0f7a67 100755 --- a/message-router/publisher/sample.client/pom.xml +++ b/message-router/publisher/sample.client/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> <version>0.4.1-SNAPSHOT</version> </parent> @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.messagerouter</groupId> + <groupId>${project.groupId}</groupId> <artifactId>publisher.api</artifactId> <version>${project.version}</version> </dependency> @@ -30,7 +30,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Private-Package>org.onap.ccsdk.messagerouter.publisher.client.impl</Private-Package> + <Private-Package>${project.groupId}.publisher.client.impl</Private-Package> </instructions> </configuration> </plugin> |