build/packaging: build tungsten only if noredist is passed

weizhouapache · Apr 30, 2024 · 4640b5f · 4640b5f
1 parent 9d5d4e5
commit 4640b5f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -27,18 +27,7 @@
         <artifactId>cloudstack</artifactId>
         <version>4.18.3.0-SNAPSHOT</version>
     </parent>
-    <repositories>
-        <repository>
-            <id>juniper-tungsten-api</id>
-            <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
-        </repository>
-    </repositories>
     <dependencies>
-        <dependency>
-            <groupId>net.juniper.tungsten</groupId>
-            <artifactId>juniper-tungsten-api</artifactId>
-            <version>2.0</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -212,11 +201,6 @@
             <artifactId>cloud-plugin-network-ovs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-network-tungsten</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-network-elb</artifactId>
@@ -962,6 +946,11 @@
                     <artifactId>cloud-plugin-network-cisco-vnmc</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.cloudstack</groupId>
+                    <artifactId>cloud-plugin-network-tungsten</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.cloudstack</groupId>
                     <artifactId>cloud-plugin-api-vmware-sioc</artifactId>

diff --git a/plugins/network-elements/tungsten/pom.xml b/plugins/network-elements/tungsten/pom.xml
@@ -30,13 +30,6 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>juniper-tungsten-api</id>
-            <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>net.juniper.tungsten</groupId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -108,7 +108,6 @@
         <module>network-elements/stratosphere-ssp</module>
         <module>network-elements/brocade-vcs</module>
         <module>network-elements/vxlan</module>
-        <module>network-elements/tungsten</module>
 
         <module>outofbandmanagement-drivers/ipmitool</module>
         <module>outofbandmanagement-drivers/nested-cloudstack</module>
@@ -195,6 +194,7 @@
                 <module>hypervisors/vmware</module>
                 <module>network-elements/cisco-vnmc</module>
                 <module>network-elements/juniper-contrail</module>
+                <module>network-elements/tungsten</module>
             </modules>
         </profile>
         <profile>

diff --git a/server/pom.xml b/server/pom.xml
@@ -26,12 +26,6 @@
         <artifactId>cloudstack</artifactId>
         <version>4.18.3.0-SNAPSHOT</version>
     </parent>
-    <repositories>
-        <repository>
-            <id>juniper-tungsten-api</id>
-            <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
-        </repository>
-    </repositories>
 
     <dependencies>
         <dependency>
@@ -187,11 +181,6 @@
             <artifactId>metrics-jvm</artifactId>
             <version>3.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>net.juniper.tungsten</groupId>
-            <artifactId>juniper-tungsten-api</artifactId>
-            <version>2.0</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>