Skip to content

Commit a162b17

Browse files
committed
Fix warning, javadocs
Add release notes entry
1 parent fa8ffb4 commit a162b17

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

RELEASE_NOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## 2.9.2
44

5+
### Maven Execution JRE used for Tests
6+
7+
Similar to what is done for the Maven Launch Actions the JRE for tests (TestNG, JUnit) is now also derived from
8+
the Maven execution JRE. Previously this was by default set to the project's JRE (derived from the `maven-compiler-plugin`s target/release configuration).
9+
The Maven execution JRE is determined from the `maven-enforcer-plugin`s `requireJavaVersion` rule by selecting the best matching installed JRE for the [configured Java version range](https://maven.apache.org/enforcer/enforcer-rules/requireJavaVersion.html).
10+
511
### Multi-Release-Jar support
612

713
JDT added support for native [https://openjdk.org/jeps/238](Multi-Release) compilation support recently.

org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenExecutionJre.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ public Optional<IVMInstall> getBestMatchingVM() {
108108
}
109109

110110
/**
111-
* The returned ID can be used e.g. as value for {@link IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH}.
111+
* The returned container path can be used as value for
112+
* {@link IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH}.
112113
*
113-
* @return the best matching JRE ID, or empty if no matching JRE could be found
114+
* @return the best matching JRE container path, or empty if no matching JRE could be found
114115
*/
115116
public Optional<String> getBestMatchingJreContainerPath() {
116117
return getBestMatchingVM().map(vm -> JavaRuntime.newJREContainerPath(vm).toPortableString());

org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.eclipse.core.resources.IProject;
3232
import org.eclipse.core.resources.ResourcesPlugin;
3333
import org.eclipse.core.runtime.CoreException;
34-
import org.eclipse.core.runtime.ILog;
3534
import org.eclipse.core.runtime.IPath;
3635
import org.eclipse.core.runtime.IProgressMonitor;
3736
import org.eclipse.core.runtime.Platform;
@@ -65,8 +64,6 @@
6564
public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaunchConstants {
6665
private static final Logger log = LoggerFactory.getLogger(MavenLaunchDelegate.class);
6766

68-
private static final ILog ECLIPSE_LOG = Platform.getLog(MavenLaunchDelegate.class);
69-
7067
private static final String LAUNCHER_TYPE = "org.codehaus.classworlds.Launcher"; //$NON-NLS-1$
7168

7269
//classworlds 2.0

0 commit comments

Comments
 (0)