diff --git a/.nfs0000000096f13a640000037c b/.nfs0000000096f13a640000037c new file mode 100644 index 00000000000..8d4ddf39d29 Binary files /dev/null and b/.nfs0000000096f13a640000037c differ diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 4ba4ffa3383..b6a193648e1 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -27,11 +27,11 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Import-Package: org.apache.commons.logging;version="1.2.0", org.apache.log4j;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)" + 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)" Automatic-Module-Name: org.eclipse.xtext.tests diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java index b6c1138b2a5..871929e61bf 100644 --- a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java +++ b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java @@ -70,10 +70,12 @@ public String put(String key, String value) { mergable = new MergeableManifest2(is); } mergable.getMainAttributes().put(MergeableManifest2.BUNDLE_VERSION, newVersion + ".qualifier"); - updateRequiredXtextBundles(mergable, newVersion); - updateImportedXtextPackages(mergable, newVersion); - updateExportedXtextPackages(mergable, newVersion); - updateRequiredBundle(mergable, versionsFromDevBom); +// updateRequiredXtextBundles(mergable, newVersion); +// updateImportedXtextPackages(mergable, newVersion); + updateImportedJunitJupiterPackages(mergable, "[6.0.0, 7.0.0)"); + updateImportedJunitPlatformPackages(mergable, "[1.3.0,2.0.0)"); +// updateExportedXtextPackages(mergable, newVersion); +// updateRequiredBundle(mergable, versionsFromDevBom); if (mergable.isModified()) { try (FileOutputStream out = new FileOutputStream(manifest)) { @@ -253,6 +255,39 @@ private static void updateImportedXtextPackages(MergeableManifest2 mergable, Str } mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true); } + + private static void updateImportedJunitJupiterPackages(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.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 @@ - - - - + + + + - +