From 2473ee36943633800cd3282dddd82b774d406881 Mon Sep 17 00:00:00 2001 From: Mehmet Emin Karaman Date: Tue, 16 Dec 2025 22:37:21 +0100 Subject: [PATCH] junit 6 --- .nfs0000000096f13a640000037c | Bin 0 -> 12288 bytes .../META-INF/MANIFEST.MF | 14 +++--- .../xtext/relengutil/BumpVersions.java | 43 ++++++++++++++++-- .../META-INF/MANIFEST.MF | 14 +++--- .../META-INF/MANIFEST.MF | 14 +++--- .../META-INF/MANIFEST.MF | 2 +- xtext-latest.target | 10 ++-- 7 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 .nfs0000000096f13a640000037c diff --git a/.nfs0000000096f13a640000037c b/.nfs0000000096f13a640000037c new file mode 100644 index 0000000000000000000000000000000000000000..8d4ddf39d2918e3dcfd0d7d9875d8b5e7ce696e3 GIT binary patch literal 12288 zcmeI2J!~9B6vrnNQ33=I)JQMulWc=$_s;piI_FRhIUyjM82cPW*ikaxo4eh3Z+Epb zXZr{?6clt&B%(qz6f_YX1r2GSr$9pj;7p6hU*2!ZhZW2@cHTQu3o=6&3bDh6Fm`|u7_PJ@v{w8txe@l9&EWi zbm&Px3R5M$O)WPy?};$>x}h!}y-q)h_-a3l+O7&7?9KLA1*`&(r@$e0WU^K@V@90A z^wNt6|f3e1*`&3v;sQa$38>^PnA*B%lp1P_wv!+tO8a6 ztAJI&Dqt0`3RnfK0#*U5fK|XMU=?@*6%cL4ZXICkkAs*z{{J8T{{Q`X#(o38fRDg7 z*a9cO2>AOs#(n}fz&BtUq+k)e2KIyR4>5KbtbljH888L@dX}-<;AikP_!3+L=fPQU z2D}XZd4{oH!ARmsP+jU=^?mSOu&CR)PPm0z{RQ3?EnK&b@Q7x$x%V^2rNZw1Or+BO*N`(-SL&+b^~zWhjvnA*9s!g+_1 ztm~GiKHdD(r)!RRx|xh*+=Y?r_15DJ;&0&li1dSmoFx^aON*>4HKmczoh0kgXr+aT zpK4v4pKZ2IpIw+6br{PB?6}~Mdfy%aAPO5Q@@iwu;WK$$Zjkh3qcS#h%-3b6!X%~- zsEd%vnKRLov8p?0^!u8)Pqia_+!^2HkvZqTLQPG!RiVpj0R&(Vlg4(^rNL?@V>)l@2njSV}%z zO72G(A9g~SHHw44<@-)tS_bcwOm^GHa*W&jAh06)DKt5oS3u)Zu6v~hTd}c5{B(mxucTQRYpP6cjb4IbQ85oQ ztQo_N06QKk#HrLAI@};9FOYV^P#9TPp$f1oV5dTDr(uSASRGKHb*kzfPPHrT;%Ix& zUv>SY=UtXTC<1Tl*s updatedPackages = new ArrayList<>(); + for (BundleOrPackage importedPackage : importedPackages.list()) { + String packageName = importedPackage.getName(); + if (packageName.startsWith("org.junit.jupiter")) { + updatedPackages.add(packageName + ";version=\"" + newVersion + "\""); + } + } + mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true); + } + + private static void updateImportedJunitPlatformPackages(MergeableManifest2 mergable, String newVersion) { + String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.IMPORT_PACKAGE); + if (oldPackages == null) + return; + BundleOrPackageList importedPackages = BundleOrPackageList.fromInput(oldPackages, mergable.getLineDelimiter(), + "version"); + List updatedPackages = new ArrayList<>(); + for (BundleOrPackage importedPackage : importedPackages.list()) { + String packageName = importedPackage.getName(); + if (packageName.startsWith("org.junit.platform")) { + updatedPackages.add(packageName + ";version=\"" + newVersion + "\""); + } + } + mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true); + } + private static void updateExportedXtextPackages(MergeableManifest2 mergable, String newVersion) { String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.EXPORT_PACKAGE); diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF index 8d4dd5cd971..95ff3288bab 100644 --- a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF @@ -15,13 +15,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport, Import-Package: jakarta.inject;version="2.0.1", org.apache.log4j;version="1.2.26", org.apache.log4j.spi;version="1.2.26", - org.junit.jupiter.api;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.function;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.io;version="[5.1.0,6.0.0)", - org.junit.jupiter.params;version="[5.1.0,6.0.0)", - org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)", - org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional + org.junit.jupiter.api;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)", + org.junit.jupiter.params;version="[6.0.0, 7.0.0)", + org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)", + org.junit.platform.commons.support;version="[1.3.0,2.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.xtext.testing Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF index 1f2690aacef..b902003475f 100644 --- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF @@ -26,13 +26,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.42.0" Import-Package: org.apache.log4j;version="1.2.26", org.apache.log4j.spi;version="1.2.26", - org.junit.jupiter.api;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.function;version="[5.1.0,6.0.0)", - org.junit.jupiter.api.io;version="[5.1.0,6.0.0)", - org.junit.jupiter.params;version="[5.1.0,6.0.0)", - org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)", - org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional + org.junit.jupiter.api;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)", + org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)", + org.junit.jupiter.params;version="[6.0.0, 7.0.0)", + org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)", + org.junit.platform.commons.support;version="[1.3.0,2.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.xtext.testing Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF index 7ae70fb0545..3a40d67bb1d 100644 --- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Import-Package: org.apache.log4j;version="1.2.26";resolution:=optional, org.junit;version="4.13.2", org.junit.internal;version="4.13.2", org.junit.internal.builders;version="4.13.2", - org.junit.jupiter.api;version="[5.0.0,6.0.0)";resolution:=optional, + org.junit.jupiter.api;version="[6.0.0, 7.0.0)";resolution:=optional, org.junit.rules;version="4.13.2";resolution:=optional, org.junit.runner;version="4.13.2", org.junit.runner.manipulation;version="4.13.2", diff --git a/xtext-latest.target b/xtext-latest.target index deeb613bc79..7d80bde5ef3 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -63,17 +63,17 @@ - - - - + + + + - +