- Removed sitebuildsettings, the deployment of this and manteinance in

opendaylight infra is troublesome and also the settings are isolated
that can be manually tweaked in the parent POM:
	- opendaylight/commons/opendaylight/pom.xl
	- third-party/commons/thirdparty
- Adjusted the deployment of third-party snapshots to happen in
opendaylight-snapshot nexus repo, given there is only deployment
access to that on jenkins and also because there is not reason to
distinguish it, anyway the groupID already avoid collision.

Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Change-Id: Ieb20f107895dc9b186b1799de5cb84dc11c5ec7c

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 39f100d6dc78b89fd8aa4bfa3bfc8c62a76c4d11..370526aca126526a4919a5ce08dbef298951b038 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -5,22 +5,15 @@
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>

-  <!-- The sitebuildsettings-pom.xml contains the specific settings
-       for a site on which the build can be performed so it will
-       contain for instance reference to the local Maven proxy/host
-       server or the local sonar etc. -->
-  <parent>
-    <groupId>sitebuildsettings</groupId>
-    <artifactId>sitebuildsettings</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../../sitebuildsettings-pom.xml</relativePath>
-  </parent>

   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

+    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>

     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


@@ -170,12 +163,12 @@
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>

-      <id>${opendaylightID}-release</id>
+      <id>opendaylight-release</id>

       <url>${nexusproxy}/repositories/opendaylight.release/</url>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <url>${nexusproxy}/repositories/opendaylight.release/</url>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>

-      <id>${opendaylightID}-snapshot</id>
+      <id>opendaylight-snapshot</id>

       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
     </snapshotRepository>
     <!-- Site deployment -->
       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
     </snapshotRepository>
     <!-- Site deployment -->

diff --git a/sitebuildsettings-pom.xml b/sitebuildsettings-pom.xml
deleted file mode 100644 (file)
index b0d5848..0000000
--- a/sitebuildsettings-pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-  <groupId>sitebuildsettings</groupId>
-  <artifactId>sitebuildsettings</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <!-- This is to allow to deploy this artifact -->
-  <distributionManagement>
-    <snapshotRepository>
-      <id>${opendaylightID}-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <properties>
-    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-    <thirdpartyID>thirdparty</thirdpartyID>
-    <opendaylightID>opendaylight</opendaylightID>
-  </properties>
-</project>

diff --git a/third-party/commons/thirdparty/pom.xml b/third-party/commons/thirdparty/pom.xml
index 28a682723a5a9e8f82a1d1be0de12bdab038430d..7883312b00f705e0f2e6e2bd90297278634c4593 100644 (file)
--- a/third-party/commons/thirdparty/pom.xml
+++ b/third-party/commons/thirdparty/pom.xml
@@ -5,22 +5,15 @@
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>

-  <!-- The sitebuildsettings-pom.xml contains the specific settings
-       for a site on which the build can be performed so it will
-       contain for instance reference to the local Maven proxy/host
-       server or the local sonar etc. -->
-  <parent>
-    <groupId>sitebuildsettings</groupId>
-    <artifactId>sitebuildsettings</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../../sitebuildsettings-pom.xml</relativePath>
-  </parent>

   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.thirdparty</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.thirdparty</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

+    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>

     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


@@ -172,21 +165,21 @@
     <!-- Third Packages hosted in local maven because not available in
          other places -->
     <repository>
     <!-- Third Packages hosted in local maven because not available in
          other places -->
     <repository>

-      <id>${thirdpartyID}</id>
+      <id>thirdparty</id>

       <name>thirdparty</name>
       <url>${nexusproxy}/repositories/thirdparty</url>
     </repository>
   </repositories>
   <distributionManagement>
       <name>thirdparty</name>
       <url>${nexusproxy}/repositories/thirdparty</url>
     </repository>
   </repositories>
   <distributionManagement>

-    <!-- Third-party Released artifact -->
+    <!-- OpenDayLight Released artifact -->

     <repository>
     <repository>

-      <id>${thirdpartyID}</id>
-      <url>${nexusproxy}/repositories/thirdparty</url>
+      <id>opendaylight-release</id>
+      <url>${nexusproxy}/repositories/opendaylight.release/</url>

     </repository>
     </repository>

-    <!-- Third-party Snapshot artifact -->
+    <!-- OpenDayLight Snapshot artifact -->

     <snapshotRepository>
     <snapshotRepository>

-      <id>${thirdpartyID}-snapshot</id>
-      <url>${nexusproxy}/repositories/thirdparty-snapshot</url>
+      <id>opendaylight-snapshot</id>
+      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>