Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump org.eclipse.platform:org.eclipse.osgi from 3.20.0 to 3.21.0 #4234

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Bump org.eclipse.platform:org.eclipse.osgi from 3.20.0 to 3.21.0 #4234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a50b84e
Bump org.eclipse.platform:org.eclipse.osgi from 3.20.0 to 3.21.0
dependabot[bot] Sep 10, 2024
b08a508
Adjust compiler target environments tests
akurtakov Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<minimal-maven-version>3.9.6</minimal-maven-version>
<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
<surefire-version>3.5.0</surefire-version>
<equinoxVersion>3.20.0</equinoxVersion>
<equinoxVersion>3.21.0</equinoxVersion>
<ecjVersion>3.38.0</ecjVersion>
<bnd.version>7.0.0</bnd.version>
<!-- these are referenced from src/main/resources/META-INF/plexus/components.xml -->
Expand Down
11 changes: 5 additions & 6 deletions tycho-core/src/test/java/org/eclipse/tycho/core/ee/StandardExecutionEnvironmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2010, 2022 SAP AG and others.
* Copyright (c) 2010, 2024 SAP AG and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand All @@ -13,7 +13,6 @@
package org.eclipse.tycho.core.ee;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -157,9 +156,9 @@ public void testCompilerTargetLevel() {
assertEquals("1.1", cdc10Environment.getCompilerTargetLevelDefault());
assertEquals("1.2", cdc11Environment.getCompilerTargetLevelDefault());
assertEquals("1.1", jre11Environment.getCompilerTargetLevelDefault());
assertEquals("1.1", j2SE12Environment.getCompilerTargetLevelDefault());
assertEquals("1.1", j2SE13Environment.getCompilerTargetLevelDefault());
assertEquals("1.2", j2SE14Environment.getCompilerTargetLevelDefault());
assertEquals("1.2", j2SE12Environment.getCompilerTargetLevelDefault());
assertEquals("1.3", j2SE13Environment.getCompilerTargetLevelDefault());
assertEquals("1.4", j2SE14Environment.getCompilerTargetLevelDefault());
assertEquals("1.5", j2SE5Environment.getCompilerTargetLevelDefault());
assertEquals("1.6", javaSE6Environment.getCompilerTargetLevelDefault());
assertEquals("1.7", javaSE7Environment.getCompilerTargetLevelDefault());
Expand All @@ -178,7 +177,7 @@ public void testCompilerTargetLevel() {
public void testCompilerTargetCompatibility() throws Exception {
assertTrue(j2SE14Environment.isCompatibleCompilerTargetLevel("1.1"));
assertTrue(j2SE14Environment.isCompatibleCompilerTargetLevel("1.2"));
assertFalse(j2SE14Environment.isCompatibleCompilerTargetLevel("1.3"));
assertTrue(j2SE14Environment.isCompatibleCompilerTargetLevel("1.3"));

// version aliases
assertTrue(j2SE5Environment.isCompatibleCompilerTargetLevel("5"));
Expand Down
Loading