You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2024/02/22 12:42:33 UTC
(pulsar) branch master updated: [fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 48c85ab1707 [fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
48c85ab1707 is described below
commit 48c85ab1707004dc27022c494dbc557f7c3e888c
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Feb 22 14:42:26 2024 +0200
[fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
---
docker/pulsar/pom.xml | 6 -----
pom.xml | 42 +++++++++++++++++++++++++++++
tests/docker-images/java-test-image/pom.xml | 6 ++---
3 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 35cff16ac2c..50d1867257a 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -47,12 +47,6 @@
</dependency>
</dependencies>
- <properties>
- <UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
- <UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
- <IMAGE_JDK_MAJOR_VERSION>17</IMAGE_JDK_MAJOR_VERSION>
- </properties>
-
<profiles>
<profile>
<id>git-commit-id-no-git</id>
diff --git a/pom.xml b/pom.xml
index b8fd41c7d63..e0f45280a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,10 @@ flexible messaging model and an intuitive client API.</description>
<pulsar.client.python.version>3.4.0</pulsar.client.python.version>
+ <UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
+ <UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
+ <IMAGE_JDK_MAJOR_VERSION>17</IMAGE_JDK_MAJOR_VERSION>
+
<!--config keys to configure test selection -->
<include>**/Test*.java,**/*Test.java,**/*Tests.java,**/*TestCase.java</include>
<exclude/>
@@ -2606,6 +2610,44 @@ flexible messaging model and an intuitive client API.</description>
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
+
+ <profile>
+ <id>ubuntu-mirror-set</id>
+ <activation>
+ <property>
+ <name>env.UBUNTU_MIRROR</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</UBUNTU_MIRROR>
+ </properties>
+ </profile>
+ <profile>
+ <id>ubuntu-security-mirror-set</id>
+ <activation>
+ <property>
+ <name>env.UBUNTU_SECURITY_MIRROR</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</UBUNTU_SECURITY_MIRROR>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk-major-version-set</id>
+ <activation>
+ <property>
+ <name>env.IMAGE_JDK_MAJOR_VERSION</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <IMAGE_JDK_MAJOR_VERSION>${env.IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
+ </properties>
+ </profile>
+
</profiles>
<repositories>
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 8e27d4ed110..a980e334114 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -35,9 +35,9 @@
<id>docker</id>
<properties>
<docker.buildArg.PULSAR_TARBALL>target/pulsar-server-distribution-bin.tar.gz</docker.buildArg.PULSAR_TARBALL>
- <docker.buildArg.UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
- <docker.buildArg.UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
- <docker.buildArg.JDK_MAJOR_VERSION>${env.IMAGE_JDK_MAJOR_VERSION}</docker.buildArg.JDK_MAJOR_VERSION>
+ <docker.buildArg.UBUNTU_MIRROR>${UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
+ <docker.buildArg.UBUNTU_SECURITY_MIRROR>${UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
+ <docker.buildArg.JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</docker.buildArg.JDK_MAJOR_VERSION>
</properties>
<activation>
<property>