diff options
| -rw-r--r-- | ncomp-sirius-manager-agent-model/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-sirius-manager-base/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-sirius-manager-camunda/pom.xml | 30 | ||||
| -rw-r--r-- | ncomp-sirius-manager-console/pom.xml | 30 | ||||
| -rw-r--r-- | ncomp-sirius-manager-drools/pom.xml | 32 | ||||
| -rw-r--r-- | ncomp-sirius-manager-generator/pom.xml | 30 | ||||
| -rw-r--r-- | ncomp-sirius-manager-model/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-sirius-manager-server/pom.xml | 32 | ||||
| -rw-r--r-- | pom.xml | 7 |
9 files changed, 122 insertions, 45 deletions
diff --git a/ncomp-sirius-manager-agent-model/pom.xml b/ncomp-sirius-manager-agent-model/pom.xml index fca02a6..a3dc07a 100644 --- a/ncomp-sirius-manager-agent-model/pom.xml +++ b/ncomp-sirius-manager-agent-model/pom.xml @@ -6,7 +6,7 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-xcore</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-xcore</relativePath> </parent> <dependencies> <dependency> diff --git a/ncomp-sirius-manager-base/pom.xml b/ncomp-sirius-manager-base/pom.xml index 01087ab..8d252c9 100644 --- a/ncomp-sirius-manager-base/pom.xml +++ b/ncomp-sirius-manager-base/pom.xml @@ -8,7 +8,7 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-base</relativePath> </parent> <properties> diff --git a/ncomp-sirius-manager-camunda/pom.xml b/ncomp-sirius-manager-camunda/pom.xml index 40c3d00..a910012 100644 --- a/ncomp-sirius-manager-camunda/pom.xml +++ b/ncomp-sirius-manager-camunda/pom.xml @@ -4,15 +4,31 @@ <artifactId>ncomp-sirius-manager-camunda</artifactId> <version>1.1.0-SNAPSHOT</version> + + + + + <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> + <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> + <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> + <site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> </properties> + + + + + <build> <plugins> @@ -170,7 +186,7 @@ </snapshotRepository> <site> <id>dcae-javadoc</id> - <url>${site.urlroot}/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/ncomp-sirius-manager-console/pom.xml b/ncomp-sirius-manager-console/pom.xml index 4042c9b..820d593 100644 --- a/ncomp-sirius-manager-console/pom.xml +++ b/ncomp-sirius-manager-console/pom.xml @@ -5,16 +5,30 @@ <artifactId>ncomp-sirius-manager-console</artifactId> <version>1.1.0-SNAPSHOT</version> + + + + + <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + + <build> @@ -140,7 +154,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/sirius/manager/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/ncomp-sirius-manager-drools/pom.xml b/ncomp-sirius-manager-drools/pom.xml index e5c8bb0..9870de8 100644 --- a/ncomp-sirius-manager-drools/pom.xml +++ b/ncomp-sirius-manager-drools/pom.xml @@ -5,16 +5,30 @@ <artifactId>ncomp-sirius-manager-drools</artifactId> <version>1.1.0-SNAPSHOT</version> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + + + + + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + + <build> @@ -102,7 +116,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/sirius/manager/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/ncomp-sirius-manager-generator/pom.xml b/ncomp-sirius-manager-generator/pom.xml index 1f88601..0af6982 100644 --- a/ncomp-sirius-manager-generator/pom.xml +++ b/ncomp-sirius-manager-generator/pom.xml @@ -5,16 +5,30 @@ <artifactId>ncomp-sirius-manager-generator</artifactId> <version>1.1.0-SNAPSHOT</version> + + + + + <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + + <build> @@ -144,7 +158,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/sirius/manager/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/ncomp-sirius-manager-model/pom.xml b/ncomp-sirius-manager-model/pom.xml index a4e6353..51a38a4 100644 --- a/ncomp-sirius-manager-model/pom.xml +++ b/ncomp-sirius-manager-model/pom.xml @@ -6,7 +6,7 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-xcore</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-xcore</relativePath> </parent> <dependencies> <dependency> diff --git a/ncomp-sirius-manager-server/pom.xml b/ncomp-sirius-manager-server/pom.xml index ceb5f09..74c9d73 100644 --- a/ncomp-sirius-manager-server/pom.xml +++ b/ncomp-sirius-manager-server/pom.xml @@ -5,16 +5,30 @@ <artifactId>ncomp-sirius-manager-server</artifactId> <version>1.1.0-SNAPSHOT</version> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + + + + + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + + <build> @@ -216,7 +230,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/sirius/manager/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> @@ -4,6 +4,11 @@ <artifactId>ncomp-sirius-manager</artifactId> <packaging>pom</packaging> + <properties> + <site.path>content/sites/site/org/openecomp/ncomp/sirius/manager/${project.artifactId}/${project.version}</site.path> + </properties> + + <modules> <module>ncomp-sirius-manager-base</module> <module>ncomp-sirius-manager-drools</module> @@ -51,7 +56,7 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../ncomp.maven/ncomp-maven-base</relativePath> </parent> </project> |