You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2025/01/08 06:58:11 UTC
(camel) 09/11: CAMEL-21585: stop overriding platform containers on the pom files
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 031071e3206bd86ade07542309fe9f499309f911
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 3 11:11:47 2025 +0100
CAMEL-21585: stop overriding platform containers on the pom files
---
components/camel-consul/pom.xml | 27 ----------------------
components/camel-zookeeper-master/pom.xml | 23 ------------------
components/camel-zookeeper/pom.xml | 24 -------------------
.../infra/consul/services/container.properties | 3 ++-
.../infra/zookeeper/services/container.properties | 3 ++-
5 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 485d5b67ce5..6443e18c4e3 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -157,31 +157,4 @@
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>ppc64le</id>
- <activation>
- <os>
- <arch>ppc64le</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipITs>${skipTests}</skipITs>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <consul.container>icr.io/ppc64le-oss/consul-ppc64le:1.9.4</consul.container>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index f1a67c816b7..0d51f582e8b 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -147,28 +147,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>ppc64le</id>
- <activation>
- <os>
- <arch>ppc64le</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipITs>${skipTests}</skipITs>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <zookeeper.container>icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10</zookeeper.container>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index a5d69722e63..05dc475fb02 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -198,29 +198,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>ppc64le</id>
- <activation>
- <os>
- <arch>ppc64le</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipITs>${skipTests}</skipITs>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <zookeeper.container>icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10</zookeeper.container>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
diff --git a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
index 5c1b4bf5343..a729c3bd58b 100644
--- a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
+++ b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-consul.container=hashicorp/consul:1.19
\ No newline at end of file
+consul.container=hashicorp/consul:1.19
+consul.container.ppc64le=icr.io/ppc64le-oss/consul-ppc64le:1.9.4
\ No newline at end of file
diff --git a/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties b/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
index c7c01c1727a..b8026d1eb0e 100644
--- a/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
+++ b/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
@@ -14,4 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-zookeeper.container=zookeeper:3.9
\ No newline at end of file
+zookeeper.container=zookeeper:3.9
+zookeeper.container.ppc64le=icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10
\ No newline at end of file