From b04d1b6404ee51ce82dc308a7443c93b39f0d8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:44:25 +0200 Subject: [PATCH 1/7] Move o.e.help.ui to Java 21 It requires it already transitively through o.e.help.base --- ua/org.eclipse.help.ui/.classpath | 2 +- ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs | 6 +++--- ua/org.eclipse.help.ui/META-INF/MANIFEST.MF | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ua/org.eclipse.help.ui/.classpath b/ua/org.eclipse.help.ui/.classpath index 81fe078c20c..375961e4d61 100644 --- a/ua/org.eclipse.help.ui/.classpath +++ b/ua/org.eclipse.help.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs index c20d2f48841..d5306c55e98 100644 --- a/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs +++ b/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,HELP diff --git a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF index 895d91bcde4..aaac5dfae17 100644 --- a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %help_system_plugin_name Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true -Bundle-Version: 4.7.200.qualifier +Bundle-Version: 4.8.0.qualifier Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";visibility: org.eclipse.ui;bundle-version="[3.206.200,4.0.0)";visibility:=reexport, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)";visibility:=reexport, org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.help.ui From 4b89c79ad49de9ebced11ad4157e5b43a99773ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:46:10 +0200 Subject: [PATCH 2/7] Move o.e.help.webapp to Java 21 It already requires it transitively through o.e.help.base --- ua/org.eclipse.help.webapp/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF | 4 ++-- ua/org.eclipse.help.webapp/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ua/org.eclipse.help.webapp/.classpath b/ua/org.eclipse.help.webapp/.classpath index 81fe078c20c..375961e4d61 100644 --- a/ua/org.eclipse.help.webapp/.classpath +++ b/ua/org.eclipse.help.webapp/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ua/org.eclipse.help.webapp/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.help.webapp/.settings/org.eclipse.jdt.core.prefs index 400c24bca02..746be238be2 100644 --- a/ua/org.eclipse.help.webapp/.settings/org.eclipse.jdt.core.prefs +++ b/ua/org.eclipse.help.webapp/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -101,7 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF index c15bd5517bd..73bb69e6cb9 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.11.700.qualifier +Bundle-Version: 3.12.0.qualifier Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -17,7 +17,7 @@ Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.test org.eclipse.help.internal.webapp.servlet;x-friends:="org.eclipse.ua.tests,org.eclipse.ua.tests.doc", org.eclipse.help.internal.webapp.utils;x-friends:="org.eclipse.ua.tests", org.eclipse.help.webapp -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0" Bundle-ActivationPolicy: lazy diff --git a/ua/org.eclipse.help.webapp/pom.xml b/ua/org.eclipse.help.webapp/pom.xml index e38699f5c25..be9914204c8 100644 --- a/ua/org.eclipse.help.webapp/pom.xml +++ b/ua/org.eclipse.help.webapp/pom.xml @@ -18,7 +18,7 @@ org.eclipse.help org.eclipse.help.webapp - 3.11.700-SNAPSHOT + 3.12.0-SNAPSHOT eclipse-plugin From c93d95ec10c8e1c5c6667ca7e8da862c440bb824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:50:35 +0200 Subject: [PATCH 3/7] Stop using deprecated Locale constructors in o.e.help.webapp --- .../eclipse/help/internal/webapp/WebappResources.java | 9 ++++----- .../org/eclipse/help/internal/webapp/data/UrlUtil.java | 5 ++--- .../eclipse/help/internal/webapp/servlet/NavServlet.java | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java index d464057bc52..e32be77080b 100644 --- a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java +++ b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. + * Copyright (c) 2000, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -182,12 +182,11 @@ private static Locale getDefaultLocale() { // break the string into tokens to get the Locale object StringTokenizer locales = new StringTokenizer(nl, "_"); //$NON-NLS-1$ if (locales.countTokens() == 1) - return new Locale(locales.nextToken(), ""); //$NON-NLS-1$ + return Locale.of(locales.nextToken(), ""); //$NON-NLS-1$ else if (locales.countTokens() == 2) - return new Locale(locales.nextToken(), locales.nextToken()); + return Locale.of(locales.nextToken(), locales.nextToken()); else if (locales.countTokens() == 3) - return new Locale(locales.nextToken(), locales.nextToken(), locales - .nextToken()); + return Locale.of(locales.nextToken(), locales.nextToken(), locales.nextToken()); else return Locale.getDefault(); } diff --git a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java index 479fe1d192b..9cb1fa5c513 100644 --- a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java +++ b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java @@ -459,10 +459,9 @@ public static Locale getLocaleObj(HttpServletRequest request, */ public static Locale getLocale(String localeStr) { if (localeStr.length() >= 5) { - return new Locale(localeStr.substring(0, 2), localeStr.substring(3, - 5)); + return Locale.of(localeStr.substring(0, 2), localeStr.substring(3, 5)); } else if (localeStr.length() >= 2) { - return new Locale(localeStr.substring(0, 2), ""); //$NON-NLS-1$ + return Locale.of(localeStr.substring(0, 2), ""); //$NON-NLS-1$ } else { return Locale.getDefault(); } diff --git a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java index ba611fa1b00..0c53d831fa9 100644 --- a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java +++ b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/NavServlet.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2016 IBM Corporation and others. + * Copyright (c) 2007, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -111,12 +111,11 @@ protected Locale getLocale (HttpServletRequest req, HttpServletResponse resp) { // break the string into tokens to get the Locale object StringTokenizer locales = new StringTokenizer(nl, "_"); //$NON-NLS-1$ if (locales.countTokens() == 1) - locale = new Locale(locales.nextToken(), ""); //$NON-NLS-1$ + locale = Locale.of(locales.nextToken(), ""); //$NON-NLS-1$ else if (locales.countTokens() == 2) - locale = new Locale(locales.nextToken(), locales.nextToken()); + locale = Locale.of(locales.nextToken(), locales.nextToken()); else if (locales.countTokens() == 3) - locale = new Locale(locales.nextToken(), locales.nextToken(), locales - .nextToken()); + locale = Locale.of(locales.nextToken(), locales.nextToken(), locales.nextToken()); else locale = Locale.getDefault(); return locale; From bda2599e2e3ae81b0b3752f259545961da7c1c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:54:16 +0200 Subject: [PATCH 4/7] Move o.e.ua.tests to Java 21 It requires it transitively already through o.e.helpbase --- ua/org.eclipse.ua.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ua/org.eclipse.ua.tests/.classpath b/ua/org.eclipse.ua.tests/.classpath index 8e0ec266dd4..5eb5abdc900 100644 --- a/ua/org.eclipse.ua.tests/.classpath +++ b/ua/org.eclipse.ua.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ua/org.eclipse.ua.tests/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.ua.tests/.settings/org.eclipse.jdt.core.prefs index 20473bf85b9..5bf927560a8 100644 --- a/ua/org.eclipse.ua.tests/.settings/org.eclipse.jdt.core.prefs +++ b/ua/org.eclipse.ua.tests/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -115,7 +115,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF index b746f850df0..cbdb3b2f7cf 100644 --- a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: User Assistance Test Bundle-SymbolicName: org.eclipse.ua.tests;singleton:=true -Bundle-Version: 3.6.500.qualifier +Bundle-Version: 3.7.0.qualifier Require-Bundle: org.eclipse.help.ui, org.eclipse.help.webapp, org.eclipse.test.performance, @@ -21,7 +21,7 @@ Import-Package: javax.servlet;version="3.1.0", org.junit.jupiter.api, org.junit.jupiter.api.function, org.junit.platform.suite.api -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.ua.tests, org.eclipse.ua.tests.browser.servlet, org.eclipse.ua.tests.cheatsheet, From f63809a09b851610a9503fb93f4bd20156f8f504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:55:51 +0200 Subject: [PATCH 5/7] Move o.e.ua.tests.doc to Java 21 It already requires it transitively through o.e.help.base --- ua/org.eclipse.ua.tests.doc/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- ua/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF | 4 ++-- ua/org.eclipse.ua.tests.doc/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ua/org.eclipse.ua.tests.doc/.classpath b/ua/org.eclipse.ua.tests.doc/.classpath index 675a5e2962b..1aa9eca95a0 100644 --- a/ua/org.eclipse.ua.tests.doc/.classpath +++ b/ua/org.eclipse.ua.tests.doc/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ua/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs index ef11411c70f..0f9ff551b01 100644 --- a/ua/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs +++ b/ua/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -115,4 +115,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/ua/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF b/ua/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF index c99f21531cf..d7724ea1b41 100644 --- a/ua/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.ua.tests.doc;singleton:=true -Bundle-Version: 1.2.600.qualifier +Bundle-Version: 1.3.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.equinox.http.registry;bundle-version="1.0.200", @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.help.base;bundle-version="3.4.0", org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="2.0.100", org.eclipse.equinox.frameworkadmin;bundle-version="2.0.200" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Import-Package: javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", diff --git a/ua/org.eclipse.ua.tests.doc/pom.xml b/ua/org.eclipse.ua.tests.doc/pom.xml index ab38ddfa27b..568e7dafe99 100644 --- a/ua/org.eclipse.ua.tests.doc/pom.xml +++ b/ua/org.eclipse.ua.tests.doc/pom.xml @@ -19,7 +19,7 @@ org.eclipse.ua org.eclipse.ua.tests.doc - 1.2.600-SNAPSHOT + 1.3.0-SNAPSHOT eclipse-test-plugin From 7a8f25ae9bed951eb4aee538979727f2cd2f2206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 09:59:40 +0200 Subject: [PATCH 6/7] Tycho version is already defined in parent, do not uselessly override --- ua/org.eclipse.ua.tests.doc/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ua/org.eclipse.ua.tests.doc/pom.xml b/ua/org.eclipse.ua.tests.doc/pom.xml index 568e7dafe99..2f765097b5b 100644 --- a/ua/org.eclipse.ua.tests.doc/pom.xml +++ b/ua/org.eclipse.ua.tests.doc/pom.xml @@ -32,7 +32,6 @@ org.eclipse.tycho tycho-surefire-plugin - ${tycho.version} true true From 0d1d329cf065b38b7fcfcbb118289860c69843a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 17 Dec 2024 10:36:58 +0200 Subject: [PATCH 7/7] Sync o.e.ua.tests pom and manifest version --- ua/org.eclipse.ua.tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ua/org.eclipse.ua.tests/pom.xml b/ua/org.eclipse.ua.tests/pom.xml index 180a79b62a7..05d9546f692 100644 --- a/ua/org.eclipse.ua.tests/pom.xml +++ b/ua/org.eclipse.ua.tests/pom.xml @@ -19,7 +19,7 @@ org.eclipse.ua org.eclipse.ua.tests - 3.6.500-SNAPSHOT + 3.7.0-SNAPSHOT eclipse-test-plugin