Merge branch 'master' of http://git.komect.net/ISG/secogateway

ControlPlatform/aaa/retey.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+while [ 0 -eq 0 ]
+do
+    echo ".................. job begin  ..................."
+    
+    # ...... call your command here 在这里调用你的命令 ......
+	 mvn clean install -Dcheckstyle.skip=true -Dmaven.gitcommitid.skip=true
+
+    # check and retry   
+
+    if [ $? -eq 0 ]; then
+        echo "--------------- job complete ---------------"
+        break;
+    else
+        echo "...............error occur, retry in 2 seconds .........."
+        sleep 2
+    fi
+done

ControlPlatform/cmhi-settings.xml

@@ -3,6 +3,13 @@
 <settings>
     <localRepository>E:\mvn_repo2</localRepository>
     <servers>
+        <!--
+		-->
+        <server>
+            <id>public-nexus</id>
+            <username>aqb</username>
+            <password>aqb123</password>
+        </server>
         <server>
             <id>local-nexus</id>
             <username>aqb</username>
@@ -13,6 +20,7 @@
             <username>aqb</username>
             <password>aqb123</password>
         </server>
+
         <server>
             <id>local-odlrelease</id>
             <username>aqb</username>
@@ -23,11 +31,24 @@
             <username>aqb</username>
             <password>aqb123</password>
         </server>
+
     </servers>
     <profiles>
         <profile>
             <id>dev</id>
             <repositories>
+                <!--
+				-->
+                <repository>
+                    <id>public-nexus</id>
+                    <url>http://nexus.komect.net/nexus/content/groups/public/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
                 <repository>
                     <id>local-nexus</id>
                     <url>http://nexus.komect.net/nexus/content/repositories/aqb/</url>
@@ -48,18 +69,47 @@
                         <enabled>true</enabled>
                     </snapshots>
                 </repository>
+
+            </repositories>
+        </profile>
+        <profile>
+            <id>opendaylight-release</id>
+            <repositories>
                 <repository>
                     <id>local-odlrelease</id>
+                    <name>local-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>local-odlrelease</id>
+                    <name>local-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>opendaylight-snapshots</id>
+            <repositories>
                 <repository>
                     <id>local-odlsnapshot</id>
+                    <name>local-odlsnapshot</name>
                     <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
                     <releases>
                         <enabled>false</enabled>
@@ -69,9 +119,24 @@
                     </snapshots>
                 </repository>
             </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>local-odlsnapshot</id>
+                    <name>local-odlsnapshot</name>
+                    <url>http://nexus.komect.net/nexus/content/repositories/opendaylight-snapshot/</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
         </profile>
     </profiles>
     <activeProfiles>
         <activeProfile>dev</activeProfile>
+        <activeProfile>opendaylight-release</activeProfile>
+        <activeProfile>opendaylight-snapshots</activeProfile>
     </activeProfiles>
 </settings>