This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0514caedd6a2c861ef8ed34f0ecaf20c068ed6fb Merge: 4ffeec6ba45 5f6acca049e Author: Daan Hoogland <[email protected]> AuthorDate: Wed Apr 24 11:10:00 2024 +0200 Merge release branch 4.18 to 4.19 * 4.18: 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 --cc client/pom.xml index b27c70287fa,7eed8e15b7d..794160eb545 --- a/client/pom.xml +++ b/client/pom.xml @@@ -25,13 -25,9 +25,9 @@@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack</artifactId> - <version>4.18.3.0-SNAPSHOT</version> + <version>4.19.1.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> diff --cc plugins/network-elements/juniper-contrail/pom.xml index 9eb61383a99,26d72e0689f..286832d891e --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@@ -24,15 -24,9 +24,9 @@@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack-plugins</artifactId> - <version>4.18.3.0-SNAPSHOT</version> + <version>4.19.1.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>
