Skip to content

Conversation

@eclipse-releng-bot
Copy link
Contributor

Prepare development of Eclipse 4.38.
This complements:

@github-actions
Copy link
Contributor

github-actions bot commented Aug 29, 2025

Test Results

 1 947 files  ±0   1 947 suites  ±0   1h 32m 58s ⏱️ + 1m 16s
 4 720 tests ±0   4 696 ✅ ±0   24 💤 ±0  0 ❌ ±0 
14 160 runs  ±0  13 993 ✅ ±0  167 💤 ±0  0 ❌ ±0 

Results for commit b33c83c. ± Comparison against base commit 39c3614.

♻️ This comment has been updated with latest results.

Copy link
Member

@HannesWell HannesWell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The automated changes look good, but it seems like org.eclipse.help.webapp get different byte-code generated although it hasn't been touched:

[ERROR] Failed to execute goal org.eclipse.tycho.extras:tycho-p2-extras-plugin:5.0.0-SNAPSHOT:compare-version-with-baselines (compare-attached-artifacts-with-release) on project org.eclipse.help.webapp: Baseline and reactor have the same fully qualified version, but different content
[ERROR] different
[ERROR]    META-INF/ECLIPSE_.RSA: present in baseline only
[ERROR]    META-INF/ECLIPSE_.SF: present in baseline only
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/advanced_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/bookmarksToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/bookmarksView_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/confirmShowAll_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/contentToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/content_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/deferredView_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/helpToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/help_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/indexToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/indexView_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/index_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/nav_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/printConfirm_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/printError_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/print_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/quickSearch_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/searchScoped_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/searchSimple_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/searchToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/searchView_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/tabs_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/tocToolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/tocView_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/toolbar_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/view_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/views_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/workingSetManager_jsp.class: different
[ERROR]    org/eclipse/help/internal/webapp/jsp/advanced/workingSet_jsp.class: different
[ERROR] -> [Help 1]

This should be investigated and if this is requires e.g. a touch on each release, it should be automated with a corresponding individual preparation script like already used in SWT and Equinox.

@HannesWell
Copy link
Member

HannesWell commented Aug 29, 2025

This should be investigated and if this is requires e.g. a touch on each release, it should be automated with a corresponding individual preparation script like already used in SWT and Equinox.

Looks like as org.eclipse.help.webapp was already touched for the previous stream

Unfortunately I haven't recorded much context.
@akurtakov or @laeubi can you explain that immediately? My guess is that the classes files are generated (there are no direct sources) and that it includes some version of the parent?
Could this version (or whatever it is) be avoided? Or should we just always enforce a new qualifier for this bundle?

@akurtakov
Copy link
Member

I remember doing it many times but not why.

@HannesWell
Copy link
Member

I remember doing it many times but not why.

OK, then let's just enforce a new qualifier for now and investigate and automate/avoid it later.

@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented Aug 31, 2025

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
terminal/features/org.eclipse.terminal.feature/feature.xml
ua/org.eclipse.help.base/META-INF/MANIFEST.MF
ua/org.eclipse.help.base/pom.xml
ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF
ua/org.eclipse.help.webapp/pom.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From a753e657190dddba7ea90f63a1800ae3b1ab8f07 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Sun, 31 Aug 2025 08:56:35 +0000
Subject: [PATCH] Version bump(s) for 4.38 stream


diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
index 38782d66fa..bfcfe70360 100644
--- a/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
+++ b/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.terminal.view.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.terminal.view.ui.internal.UIPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.terminal.view.ui;version="1.0.0",
+Export-Package: org.eclipse.terminal.view.ui;version="1.0.100",
  org.eclipse.terminal.view.ui.internal;x-internal:=true,
  org.eclipse.terminal.view.ui.internal.actions;x-internal:=true,
  org.eclipse.terminal.view.ui.internal.dialogs;x-internal:=true,
@@ -29,8 +29,8 @@ Export-Package: org.eclipse.terminal.view.ui;version="1.0.0",
  org.eclipse.terminal.view.ui.internal.preferences;x-internal:=true,
  org.eclipse.terminal.view.ui.internal.tabs;x-internal:=true,
  org.eclipse.terminal.view.ui.internal.view;x-internal:=true,
- org.eclipse.terminal.view.ui.launcher;version="1.0.0",
- org.eclipse.terminal.view.ui.streams;version="1.0.0"
+ org.eclipse.terminal.view.ui.launcher;version="1.0.100",
+ org.eclipse.terminal.view.ui.streams;version="1.0.100"
 Automatic-Module-Name: org.eclipse.terminal.view.ui
 Import-Package: org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
  org.eclipse.terminal.connector.provider;version="[1.0.0,2.0.0)",
diff --git a/terminal/features/org.eclipse.terminal.feature/feature.xml b/terminal/features/org.eclipse.terminal.feature/feature.xml
index 94b6c6d51b..3d9e6ec5f4 100644
--- a/terminal/features/org.eclipse.terminal.feature/feature.xml
+++ b/terminal/features/org.eclipse.terminal.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.terminal.feature"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="1.0.100.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/ua/org.eclipse.help.base/META-INF/MANIFEST.MF
index 3b62b5d40a..218de36b1b 100644
--- a/ua/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_base_plugin_name
 Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
-Bundle-Version: 4.5.200.qualifier
+Bundle-Version: 4.5.300.qualifier
 Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ua/org.eclipse.help.base/pom.xml b/ua/org.eclipse.help.base/pom.xml
index 5096103519..e77fdac893 100644
--- a/ua/org.eclipse.help.base/pom.xml
+++ b/ua/org.eclipse.help.base/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>4.5.200-SNAPSHOT</version>
+  <version>4.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
diff --git a/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF
index 68591aefdf..2a4d0874d3 100644
--- a/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_webapp_plugin_name
 Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true
-Bundle-Version: 3.12.200.qualifier
+Bundle-Version: 3.12.300.qualifier
 Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ua/org.eclipse.help.webapp/pom.xml b/ua/org.eclipse.help.webapp/pom.xml
index 1fe1b9ca32..548808eedd 100644
--- a/ua/org.eclipse.help.webapp/pom.xml
+++ b/ua/org.eclipse.help.webapp/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.help.webapp</artifactId>
-  <version>3.12.200-SNAPSHOT</version>
+  <version>3.12.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
-- 
2.51.0

Further information are available in Common Build Issues - Missing version increments.

@HannesWell
Copy link
Member

OK, then let's just enforce a new qualifier for now and investigate and automate/avoid it later.

I ran the build locally with the keepSources property of the jetty-ee8-jspc-maven-plugin set to true but the kept java sources didn't show a difference. The same was true for the de-compiled byte-code shown in the Bytecode view.
Maybe checking the resulting class files from the next I-build explains better what's happening...

@HannesWell HannesWell merged commit 945d85f into master Aug 31, 2025
18 checks passed
@HannesWell HannesWell deleted the prepare-R4.38 branch August 31, 2025 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants