apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.18 to 4.19

Browse Source 
* 4.18:
  packaging: move contrail network plugin to noredist (#8932)
This commit is contained in:
Daan Hoogland 2024-04-24 11:10:00 +02:00
commit 0514caedd6
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/pom.xml
View File

@ -28,10 +28,6 @@
<version>4.19.1.0-SNAPSHOT</version> <version>4.19.1.0-SNAPSHOT</version>
</parent> </parent>
<repositories> <repositories>
<repository>
<id>juniper-contrail</id>
<url>https://juniper.github.io/contrail-maven/snapshots</url>
</repository>
<repository> <repository>
<id>juniper-tungsten-api</id> <id>juniper-tungsten-api</id>
<url>https://github.com/radu-todirica/tungsten-api/raw/master</url> <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
@ -271,11 +267,6 @@
<artifactId>cloud-plugin-network-nvp</artifactId> <artifactId>cloud-plugin-network-nvp</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-contrail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-palo-alto</artifactId> <artifactId>cloud-plugin-network-palo-alto</artifactId>
@ -1102,6 +1093,11 @@
<artifactId>cloud-plugin-api-vmware-sioc</artifactId> <artifactId>cloud-plugin-api-vmware-sioc</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-contrail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-backup-veeam</artifactId> <artifactId>cloud-plugin-backup-veeam</artifactId>

6
plugins/network-elements/juniper-contrail/pom.xml
View File

@ -27,12 +27,6 @@
<version>4.19.1.0-SNAPSHOT</version> <version>4.19.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<repositories>
<repository>
<id>juniper-contrail</id>
<url>https://juniper.github.io/contrail-maven/snapshots</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>

2
plugins/pom.xml
View File

@ -100,7 +100,6 @@
<module>network-elements/bigswitch</module> <module>network-elements/bigswitch</module>
<module>network-elements/dns-notifier</module> <module>network-elements/dns-notifier</module>
<module>network-elements/juniper-contrail</module>
<module>network-elements/elastic-loadbalancer</module> <module>network-elements/elastic-loadbalancer</module>
<module>network-elements/globodns</module> <module>network-elements/globodns</module>
<module>network-elements/internal-loadbalancer</module> <module>network-elements/internal-loadbalancer</module>
@ -230,6 +229,7 @@
<module>backup/veeam</module> <module>backup/veeam</module>
<module>hypervisors/vmware</module> <module>hypervisors/vmware</module>
<module>network-elements/cisco-vnmc</module> <module>network-elements/cisco-vnmc</module>
<module>network-elements/juniper-contrail</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>