From f3e6de07d1d8b052245fe4d483c20815ff746b43 Mon Sep 17 00:00:00 2001
From: dongxiancun <dongxiancun@cmhi.chinamobile.com>
Date: Wed, 24 Jul 2019 18:05:15 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=AE=E6=94=B9=E9=92=88?=
 =?UTF-8?q?=E5=AF=B9=E5=85=AC=E5=8F=B8nexus=E7=9A=84=E6=9C=AC=E5=9C=B0mave?=
 =?UTF-8?q?n=E9=85=8D=E7=BD=AE=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=9Adongxiancun=20=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9Adongxiancun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ControlPlatform/cmhi-settings.xml | 64 +++++++++++++------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/ControlPlatform/cmhi-settings.xml b/ControlPlatform/cmhi-settings.xml
index 0664683a7..548ce083d 100644
--- a/ControlPlatform/cmhi-settings.xml
+++ b/ControlPlatform/cmhi-settings.xml
@@ -99,39 +99,7 @@
 		<profile>
             <id>cmhiodlreleaseprofile</id>
             <repositories>
-                <repository>
-                    <id>cmhi-odlrelease</id>
-                    <name>cmhi-odlrelease</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>cmhi-odlrelease</id>
-                    <name>cmhi-odlrelease</name>
-                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-		<profile>
-            <id>sdndev</id>
-            <!-- 设定远程主仓库，按设定顺序进行查找。 -->
-            <repositories>
-                <!--
+			    <!--
                 aliyun
 				-->
                 <repository>
@@ -167,7 +135,7 @@
                         <enabled>false</enabled>
                     </snapshots>
                 </repository>
-                <repository>
+				<repository>
                     <id>local-snapshot</id>
                     <url>http://nexus.komect.net/nexus/content/repositories/KomectAQBsnapshot/</url>
                     <releases>
@@ -177,10 +145,21 @@
                         <enabled>true</enabled>
                     </snapshots>
                 </repository>
-
+                <repository>
+                    <id>cmhi-odlrelease</id>
+                    <name>cmhi-odlrelease</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
             </repositories>
             <pluginRepositories>
-                <pluginRepository>
+			    <pluginRepository>
                     <id>ali</id>
                     <name>aliyun-pluginRepository</name>
                     <url>http://maven.aliyun.com/nexus/content/groups/public</url>
@@ -191,11 +170,22 @@
                         <enabled>true</enabled>
                     </snapshots>
                 </pluginRepository>
+                <pluginRepository>
+                    <id>cmhi-odlrelease</id>
+                    <name>cmhi-odlrelease</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-release/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
             </pluginRepositories>
         </profile>
     </profiles>
     <activeProfiles>
-        <activeProfile>sdndev</activeProfile>
 		<activeProfile>cmhiodlreleaseprofile</activeProfile>
         <activeProfile>cmhiodlsnapshotprofile</activeProfile>
     </activeProfiles>