This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit d0059ff4ade69f3d496850f0537c9e44f1ea1b39 Author: Otavio Rodolfo Piske <[email protected]> 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 6649ec016ef..3561063e765 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 bf18aa9cb53..5ae9ce603d6 100644 --- a/components/camel-zookeeper-master/pom.xml +++ b/components/camel-zookeeper-master/pom.xml @@ -146,28 +146,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 6c848bc6d02..e2306ddeab6 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 e79431f3d74..01df2d92929 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=consul:1.15.4 \ No newline at end of file +consul.container=hashicorp/consul:1.15.4 +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
