This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new 5f6acca049e packaging: move contrail network plugin to noredist (#8932)
5f6acca049e is described below
commit 5f6acca049e37b9298388e2b7a2334fa041d5a22
Author: Wei Zhou <[email protected]>
AuthorDate: Wed Apr 24 10:28:59 2024 +0200
packaging: move contrail network plugin to noredist (#8932)
---
client/pom.xml | 14 +++++---------
plugins/network-elements/juniper-contrail/pom.xml | 6 ------
plugins/pom.xml | 2 +-
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 6253975de4c..7eed8e15b7d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -28,10 +28,6 @@
<version>4.18.3.0-SNAPSHOT</version>
</parent>
<repositories>
- <repository>
- <id>juniper-contrail</id>
- <url>https://juniper.github.io/contrail-maven/snapshots</url>
- </repository>
<repository>
<id>juniper-tungsten-api</id>
<url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
@@ -201,11 +197,6 @@
<artifactId>cloud-plugin-network-nvp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-network-contrail</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-palo-alto</artifactId>
@@ -976,6 +967,11 @@
<artifactId>cloud-plugin-api-vmware-sioc</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-network-contrail</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-backup-veeam</artifactId>
diff --git a/plugins/network-elements/juniper-contrail/pom.xml
b/plugins/network-elements/juniper-contrail/pom.xml
index f3b2283387f..26d72e0689f 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -27,12 +27,6 @@
<version>4.18.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <repositories>
- <repository>
- <id>juniper-contrail</id>
- <url>https://juniper.github.io/contrail-maven/snapshots</url>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1c961f7b9ae..4235e7cd356 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -97,7 +97,6 @@
<module>network-elements/bigswitch</module>
<module>network-elements/dns-notifier</module>
- <module>network-elements/juniper-contrail</module>
<module>network-elements/elastic-loadbalancer</module>
<module>network-elements/globodns</module>
<module>network-elements/internal-loadbalancer</module>
@@ -195,6 +194,7 @@
<module>backup/veeam</module>
<module>hypervisors/vmware</module>
<module>network-elements/cisco-vnmc</module>
+ <module>network-elements/juniper-contrail</module>
</modules>
</profile>
<profile>
