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

Bump actions/setup-java from 4.5.0 to 4.6.0 #4545

Merged
merged 2 commits into from
Dec 20, 2024
Merged

Bump actions/setup-java from 4.5.0 to 4.6.0 #4545

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
bb9b19f
Bump actions/setup-java from 4.5.0 to 4.6.0
dependabot[bot] Dec 18, 2024
d7ac55b
Stop using simrel 2021-06 in tests
akurtakov Dec 20, 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 .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: |
21
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sitedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
token: ${{ secrets.TYCHO_SITE_PAT }}
repository: 'eclipse-tycho/eclipse-tycho.github.io'
- name: Set up Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: 17
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-platform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
repository: 'eclipse-platform/eclipse.platform.releng.aggregator'
fetch-depth: 0
- name: Set up Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: |
11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-platform2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
repository: 'eclipse-platform/eclipse.platform'
fetch-depth: 0
- name: Set up Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: |
11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-platform3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
repository: 'eclipse-platform/eclipse.platform.swt'
fetch-depth: 0
- name: Set up Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: |
11
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/target.restriction.filter/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Require-Bundle: org.eclipse.osgi,
org.junit
Bundle-Activator: test.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
4 changes: 2 additions & 2 deletions tycho-its/projects/target.restriction.filter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<executionEnvironment>JavaSE-11</executionEnvironment>
<executionEnvironment>JavaSE-17</executionEnvironment>
<filters>
<filter>
<!-- make sure that a 3.4.x version of bundle org.eclipse.osgi is used -->
<type> eclipse-plugin </type>
<id> org.eclipse.osgi </id> <!-- extra whitespace is not needed; it is just here to make the test harder -->
<restrictTo>
<versionRange>
[3.16,3.17)
[3.21,3.22)
</versionRange>
</restrictTo>
</filter>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/target.restriction.filter/src/test/Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class Test extends TestCase {

public void test() {
Version version = new Version((String) Activator.context.getBundle(0).getHeaders().get("Bundle-Version"));
assertTrue(version.compareTo(new Version("3.17")) < 0);
assertTrue(version.compareTo(new Version("3.22")) < 0);
}

}
2 changes: 1 addition & 1 deletion ...s/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TargetPlatformFilteringIntegrationTest extends AbstractTychoIntegra
@Test
public void test() throws Exception {
Verifier verifier = getVerifier("target.restriction.filter", false);
verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2021-06/");
verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2024-09/");
verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString().replace("/", "//"));
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
Expand Down
Loading