organize imports #2579

[jukzi]

enabled organize imports and automated cleanup

https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2579

[eclipse-jdt-bot]

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

org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
org.eclipse.jdt.annotation/pom.xml
org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
org.eclipse.jdt.apt.tests/pom.xml
org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
org.eclipse.jdt.compiler.apt.tests/pom.xml
org.eclipse.jdt.core.tests.builder.mockcompiler/META-INF/MANIFEST.MF
org.eclipse.jdt.core.tests.builder.mockcompiler/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 b94a1ca9c5233d08c75372d2819fbd7a98a8fdfa Mon Sep 17 00:00:00 2001 From: Eclipse JDT Bot Date: Mon, 30 Sep 2024 12:46:03 +0000 Subject: [PATCH] Version bump(s) for 4.34 stream diff --git a/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF index 2997f664bc..0d5207519d 100644 --- a/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-Localization: bundle Bundle-SymbolicName: org.eclipse.jdt.annotation -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 2.3.100.qualifier Export-Package: org.eclipse.jdt.annotation Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName diff --git a/org.eclipse.jdt.annotation/pom.xml b/org.eclipse.jdt.annotation/pom.xml index 3fbe7f9d2f..a9298c3f49 100644 --- a/org.eclipse.jdt.annotation/pom.xml +++ b/org.eclipse.jdt.annotation/pom.xml @@ -17,7 +17,7 @@ 4.34.0-SNAPSHOT org.eclipse.jdt.annotation - 2.3.0-SNAPSHOT + 2.3.100-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF index fe19775bea..5fa3f3bff4 100644 --- a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.apt.tests; singleton:=true -Bundle-Version: 3.6.500.qualifier +Bundle-Version: 3.6.600.qualifier Bundle-ClassPath: apt.jar, aptext.jar, . diff --git a/org.eclipse.jdt.apt.tests/pom.xml b/org.eclipse.jdt.apt.tests/pom.xml index 6b15b3c334..b59b429240 100644 --- a/org.eclipse.jdt.apt.tests/pom.xml +++ b/org.eclipse.jdt.apt.tests/pom.xml @@ -19,7 +19,7 @@ ../tests-pom/ org.eclipse.jdt.apt.tests - 3.6.500-SNAPSHOT + 3.6.600-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF index 8ab09f00e2..6ef32b06cf 100644 --- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.compiler.apt.tests;singleton:=true -Bundle-Version: 1.3.500.qualifier +Bundle-Version: 1.3.600.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jdt.compiler.apt.tests/pom.xml b/org.eclipse.jdt.compiler.apt.tests/pom.xml index 1a29841941..96ab73e58c 100644 --- a/org.eclipse.jdt.compiler.apt.tests/pom.xml +++ b/org.eclipse.jdt.compiler.apt.tests/pom.xml @@ -19,7 +19,7 @@ ../tests-pom/ org.eclipse.jdt.compiler.apt.tests - 1.3.500-SNAPSHOT + 1.3.600-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.jdt.core.tests.builder.mockcompiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder.mockcompiler/META-INF/MANIFEST.MF index 802d4f8c7e..41ecd36247 100644 --- a/org.eclipse.jdt.core.tests.builder.mockcompiler/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.builder.mockcompiler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.builder.mockcompiler; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Fragment-Host: org.eclipse.jdt.core diff --git a/org.eclipse.jdt.core.tests.builder.mockcompiler/pom.xml b/org.eclipse.jdt.core.tests.builder.mockcompiler/pom.xml index f0f232d05d..f593853f66 100644 --- a/org.eclipse.jdt.core.tests.builder.mockcompiler/pom.xml +++ b/org.eclipse.jdt.core.tests.builder.mockcompiler/pom.xml @@ -20,6 +20,6 @@ ../tests-pom/ org.eclipse.jdt.core.tests.builder.mockcompiler - 1.0.0-SNAPSHOT + 1.0.100-SNAPSHOT eclipse-plugin -- 2.46.1 ```

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

[jukzi]

ignoring random fails and merging before likely mergeconflicts happen

[stephan-herrmann]

I beg your pardon, you are changing 1650 files, request a review and can't hold your horses waiting for the review? Do you expect a voluntary committer to react to your request on the same day, perhaps same hour, no matter what his job might require from him?

What makes you so sure that there is absolutely no problem in this commit?

I'm sure there are better ways to minimize merge conflicts.

[stephan-herrmann]

Please also coordinate with @jarthana wrt BETA_JAVA24, since you actually missed the window where we had only one active branch.

[jarthana]

The BETA branch hasn't yet evolved, but I do have changes in my PR. So, I guess that'll have to deal with the merge conflicts. :( Let's see how that goes.