This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 50913879c3 [RELEASE] fix version for p2 libraries (#7913)
50913879c3 is described below

commit 50913879c3e5dcabf40816b27d429c4795dd2e38
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Aug 12 13:08:00 2026 +0200

    [RELEASE] fix version for p2 libraries (#7913)
---
 lib-p2/swtbot/pom.xml | 11 +++++++----
 lib-p2/tm4e/pom.xml   |  9 ++++++---
 plugins/pom.xml       |  5 +++--
 pom.xml               |  1 +
 rcp/pom.xml           |  8 ++++----
 ui/pom.xml            |  5 +++--
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/lib-p2/swtbot/pom.xml b/lib-p2/swtbot/pom.xml
index e854628d48..0902dd6a4f 100644
--- a/lib-p2/swtbot/pom.xml
+++ b/lib-p2/swtbot/pom.xml
@@ -25,20 +25,23 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <!-- The wrapper inherits the Hop version on purpose: maven-release-plugin 
rewrites the version
+         of every reactor module, so an upstream version here would be 
replaced at release time.
+         The SWTBot build to fetch is ${swtbot.version} (root pom), never 
${project.version}. -->
     <groupId>org.eclipse</groupId>
     <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-    <version>4.3.0</version>
     <packaging>pom</packaging>
     <name>Eclipse SWTBot Wrapper</name>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         
<swtbot.download.dir>${project.build.directory}/download</swtbot.download.dir>
-        
<swtbot.finder.file>org.eclipse.swtbot.swt.finder_4.3.0.202506021445.jar</swtbot.finder.file>
+        
<swtbot.finder.file>org.eclipse.swtbot.swt.finder_${swtbot.version}.${swtbot.qualifier}.jar</swtbot.finder.file>
         
<swtbot.finder.jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</swtbot.finder.jar>
-        
<swtbot.junit5.file>org.eclipse.swtbot.junit5_x_4.3.0.202506021445.jar</swtbot.junit5.file>
+        
<swtbot.junit5.file>org.eclipse.swtbot.junit5_x_${swtbot.version}.${swtbot.qualifier}.jar</swtbot.junit5.file>
         
<swtbot.junit5.jar>${project.build.directory}/${project.artifactId}-${project.version}-junit5.jar</swtbot.junit5.jar>
-        
<swtbot.plugins.url>https://download.eclipse.org/technology/swtbot/releases/${project.version}/plugins</swtbot.plugins.url>
+        
<swtbot.plugins.url>https://download.eclipse.org/technology/swtbot/releases/${swtbot.version}/plugins</swtbot.plugins.url>
+        <swtbot.qualifier>202506021445</swtbot.qualifier>
     </properties>
 
     <!-- SWTBot's bundles Import-Package hamcrest, slf4j and (in SWTBotAssert) 
org.junit, so the
diff --git a/lib-p2/tm4e/pom.xml b/lib-p2/tm4e/pom.xml
index d50c016df3..e77cf9a064 100644
--- a/lib-p2/tm4e/pom.xml
+++ b/lib-p2/tm4e/pom.xml
@@ -25,18 +25,21 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <!-- The wrapper inherits the Hop version on purpose: maven-release-plugin 
rewrites the version
+         of every reactor module, so an upstream version here would be 
replaced at release time.
+         The TM4E build to fetch is ${tm4e.core.version} (root pom), never 
${project.version}. -->
     <groupId>org.eclipse</groupId>
     <artifactId>org.eclipse.tm4e.core</artifactId>
-    <version>0.17.2</version>
     <packaging>pom</packaging>
     <name>Eclipse TM4E Core Wrapper</name>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         
<tm4e.core.download.dir>${project.build.directory}/download</tm4e.core.download.dir>
-        
<tm4e.core.download.file>org.eclipse.tm4e.core_0.17.2.202511281144.jar</tm4e.core.download.file>
-        
<tm4e.core.download.url>https://download.eclipse.org/tm4e/releases/0.17.2/plugins/${tm4e.core.download.file}</tm4e.core.download.url>
+        
<tm4e.core.download.file>org.eclipse.tm4e.core_${tm4e.core.version}.${tm4e.core.qualifier}.jar</tm4e.core.download.file>
+        
<tm4e.core.download.url>https://download.eclipse.org/tm4e/releases/${tm4e.core.version}/plugins/${tm4e.core.download.file}</tm4e.core.download.url>
         
<tm4e.core.jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</tm4e.core.jar>
+        <tm4e.core.qualifier>202511281144</tm4e.core.qualifier>
     </properties>
 
     <dependencyManagement>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 79f43e7c6d..f7c04894c6 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -121,16 +121,17 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- The lib-p2 wrapper carries the Hop version, not the wrapped 
SWTBot version. -->
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <classifier>junit5</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index e45a034bf2..b4fe178b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,7 @@
         <spotless.skip>false</spotless.skip>
         <swtbot.version>4.3.0</swtbot.version>
         <target.jdk.version>21</target.jdk.version>
+        <tm4e.core.version>0.17.2</tm4e.core.version>
         <ui.test.argLine></ui.test.argLine>
         <ui.test.excludedGroups></ui.test.excludedGroups>
         <ui.test.includedGroups></ui.test.includedGroups>
diff --git a/rcp/pom.xml b/rcp/pom.xml
index 374e8220fa..71372727d3 100644
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -32,14 +32,14 @@
     <properties>
         <assembly_package-phase>none</assembly_package-phase>
         <jface.text.version>3.29.0</jface.text.version>
-        <tm4e.core.version>0.17.2</tm4e.core.version>
     </properties>
 
     <dependencies>
+        <!-- The lib-p2 wrappers carry the Hop version, not the wrapped 
Eclipse version. -->
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.tm4e.core</artifactId>
-            <version>${tm4e.core.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.platform</groupId>
@@ -80,13 +80,13 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <classifier>junit5</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/ui/pom.xml b/ui/pom.xml
index 27c2f6d989..e3095fbfed 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -119,16 +119,17 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <!-- The lib-p2 wrapper carries the Hop version, not the wrapped 
SWTBot version. -->
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.swtbot.swt.finder</artifactId>
-            <version>${swtbot.version}</version>
+            <version>${project.version}</version>
             <classifier>junit5</classifier>
             <scope>test</scope>
         </dependency>

Reply via email to