From ada7a96085c5683d9dae15a551688dbd36b6cac6 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 11 Dec 2023 08:59:17 +0100 Subject: [PATCH 1/8] updated copy libs launches for Java 11 --- .../org.pitest.pitest-junit5-plugin/clean-copy-libs.launch | 5 +++++ bundles/org.pitest/clean-copy-libs.launch | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bundles/org.pitest.pitest-junit5-plugin/clean-copy-libs.launch b/bundles/org.pitest.pitest-junit5-plugin/clean-copy-libs.launch index bf07a0fb..2a051a06 100644 --- a/bundles/org.pitest.pitest-junit5-plugin/clean-copy-libs.launch +++ b/bundles/org.pitest.pitest-junit5-plugin/clean-copy-libs.launch @@ -1,5 +1,6 @@ + @@ -12,6 +13,10 @@ + + + + diff --git a/bundles/org.pitest/clean-copy-libs.launch b/bundles/org.pitest/clean-copy-libs.launch index 8fe96322..9eedbedf 100644 --- a/bundles/org.pitest/clean-copy-libs.launch +++ b/bundles/org.pitest/clean-copy-libs.launch @@ -1,5 +1,6 @@ + @@ -12,6 +13,10 @@ + + + + From 828a8144948d5cee45fd4302311f9d824bcd4bd6 Mon Sep 17 00:00:00 2001 From: Emmanuel CHEBBI Date: Sat, 23 Mar 2024 23:45:39 +0100 Subject: [PATCH 2/8] bump tycho to 4.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4abb5be7..37ee78d9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ - 2.7.5 + 4.0.6 0.8.6 From bccd096ed26b41d5e975a140ab95191dcba22b80 Mon Sep 17 00:00:00 2001 From: Emmanuel CHEBBI Date: Tue, 26 Mar 2024 21:28:06 +0100 Subject: [PATCH 3/8] [TMP] bump CI's mvn version to 3.9.6 --- .github/workflows/check-installation.yml | 4 ++++ .github/workflows/maven-old-tp.yml | 4 ++++ .github/workflows/maven.yml | 4 ++++ .github/workflows/windows-mac.yml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/.github/workflows/check-installation.yml b/.github/workflows/check-installation.yml index d312f160..0aa3b727 100644 --- a/.github/workflows/check-installation.yml +++ b/.github/workflows/check-installation.yml @@ -22,6 +22,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Set up Maven + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 - name: Cache Maven packages uses: actions/cache@v2 with: diff --git a/.github/workflows/maven-old-tp.yml b/.github/workflows/maven-old-tp.yml index 970311ee..b2520ea6 100644 --- a/.github/workflows/maven-old-tp.yml +++ b/.github/workflows/maven-old-tp.yml @@ -25,6 +25,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Set up Maven + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 - name: Install WebKit # required for SWT Browser run: | sudo apt update diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b6e56cf1..37399b68 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,6 +23,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Set up Maven + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 - name: Install WebKit # required for SWT Browser run: | sudo apt update diff --git a/.github/workflows/windows-mac.yml b/.github/workflows/windows-mac.yml index 078db472..f1ec5577 100644 --- a/.github/workflows/windows-mac.yml +++ b/.github/workflows/windows-mac.yml @@ -25,6 +25,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Set up Maven + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 - name: Cache Maven packages uses: actions/cache@v2 with: From d86bbf0e270a4895fd8633b3cf2bc31bb0f3e0d3 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 27 Mar 2024 11:36:04 +0100 Subject: [PATCH 4/8] use Java 17 in the CI (with the new setup-java action) --- .github/workflows/check-installation.yml | 7 ++++--- .github/workflows/maven-old-tp.yml | 7 ++++--- .github/workflows/maven.yml | 7 ++++--- .github/workflows/windows-mac.yml | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-installation.yml b/.github/workflows/check-installation.yml index 0aa3b727..38bdefe5 100644 --- a/.github/workflows/check-installation.yml +++ b/.github/workflows/check-installation.yml @@ -18,10 +18,11 @@ jobs: with: # Shallow clones should be disabled for a better relevancy of SonarQube analysis fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3.6.0 with: - java-version: 11 + java-version: 17 + distribution: temurin - name: Set up Maven uses: stCarolas/setup-maven@v5 with: diff --git a/.github/workflows/maven-old-tp.yml b/.github/workflows/maven-old-tp.yml index b2520ea6..e34ac31f 100644 --- a/.github/workflows/maven-old-tp.yml +++ b/.github/workflows/maven-old-tp.yml @@ -21,10 +21,11 @@ jobs: with: # Shallow clones should be disabled for a better relevancy of SonarQube analysis fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3.6.0 with: - java-version: 11 + java-version: 17 + distribution: temurin - name: Set up Maven uses: stCarolas/setup-maven@v5 with: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 37399b68..e7cebfc1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,10 +19,11 @@ jobs: with: # Shallow clones should be disabled for a better relevancy of SonarQube analysis fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3.6.0 with: - java-version: 11 + java-version: 17 + distribution: temurin - name: Set up Maven uses: stCarolas/setup-maven@v5 with: diff --git a/.github/workflows/windows-mac.yml b/.github/workflows/windows-mac.yml index f1ec5577..61e9c68c 100644 --- a/.github/workflows/windows-mac.yml +++ b/.github/workflows/windows-mac.yml @@ -21,10 +21,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3.6.0 with: - java-version: 11 + java-version: 17 + distribution: temurin - name: Set up Maven uses: stCarolas/setup-maven@v5 with: From 90f4649c17b17959839cf566501e53376978d8dc Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 27 Mar 2024 11:42:48 +0100 Subject: [PATCH 5/8] fixed ObjectStreamSocketTest Closes https://github.com/pitest/pitclipse/issues/215 --- .../org.pitest.pitclipse.runner.tests.launch | 5 ++- .../runner/io/ObjectStreamSocketTest.java | 37 +++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/org.pitest.pitclipse.runner.tests/org.pitest.pitclipse.runner.tests.launch b/tests/org.pitest.pitclipse.runner.tests/org.pitest.pitclipse.runner.tests.launch index f763eb53..a725531e 100644 --- a/tests/org.pitest.pitclipse.runner.tests/org.pitest.pitclipse.runner.tests.launch +++ b/tests/org.pitest.pitclipse.runner.tests/org.pitest.pitclipse.runner.tests.launch @@ -14,6 +14,7 @@ + @@ -24,7 +25,9 @@ - + + + diff --git a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/ObjectStreamSocketTest.java b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/ObjectStreamSocketTest.java index 74c56d44..4e69538e 100644 --- a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/ObjectStreamSocketTest.java +++ b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/ObjectStreamSocketTest.java @@ -16,22 +16,6 @@ package org.pitest.pitclipse.runner.io; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; -import java.io.Serializable; -import java.net.Socket; - import static org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals; import static org.apache.commons.lang3.builder.HashCodeBuilder.reflectionHashCode; import static org.hamcrest.CoreMatchers.equalTo; @@ -43,10 +27,25 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.net.Socket; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + @RunWith(MockitoJUnitRunner.class) public class ObjectStreamSocketTest { @@ -121,7 +120,7 @@ public void makeThrowsException() throws IOException { @Test public void readThrowsException() throws IOException, ClassNotFoundException { - InputStream inputStream = spy(new ByteArrayInputStream(asBytes(expectedObject))); + InputStream inputStream = new ByteArrayInputStream(asBytes(expectedObject)); OutputStream outputStream = new ByteArrayOutputStream(); when(underlyingSocket.getInputStream()).thenReturn(inputStream); when(underlyingSocket.getOutputStream()).thenReturn(outputStream); @@ -138,7 +137,7 @@ public void readThrowsException() throws IOException, ClassNotFoundException { @Test public void writeThrowsException() throws IOException, ClassNotFoundException { - InputStream inputStream = spy(new ByteArrayInputStream(asBytes(expectedObject))); + InputStream inputStream = new ByteArrayInputStream(asBytes(expectedObject)); OutputStream outputStream = new ByteArrayOutputStream(); when(underlyingSocket.getInputStream()).thenReturn(inputStream); when(underlyingSocket.getOutputStream()).thenReturn(outputStream); From c992f24227fe71185bf904cf48501a798c0ff077 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 27 Mar 2024 11:59:03 +0100 Subject: [PATCH 6/8] Photon -> 2018-09 as older target --- releng/org.pitest.pitclipse.target/older.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.pitest.pitclipse.target/older.target b/releng/org.pitest.pitclipse.target/older.target index 7209ab5b..a11bec22 100644 --- a/releng/org.pitest.pitclipse.target/older.target +++ b/releng/org.pitest.pitclipse.target/older.target @@ -10,7 +10,7 @@ - + From c65650d7639c75d79ef7e8c20126eebe84eb6091 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 27 Mar 2024 12:12:22 +0100 Subject: [PATCH 7/8] older target 2021-12 --- releng/org.pitest.pitclipse.target/older.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.pitest.pitclipse.target/older.target b/releng/org.pitest.pitclipse.target/older.target index a11bec22..171c51b9 100644 --- a/releng/org.pitest.pitclipse.target/older.target +++ b/releng/org.pitest.pitclipse.target/older.target @@ -10,7 +10,7 @@ - + From 17408d25fae261ad71298c5990e0783a05c8d42f Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 27 Mar 2024 12:25:10 +0100 Subject: [PATCH 8/8] updated tycho for pomless build --- .mvn/extensions.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index afe69eb0..02d68c60 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,9 +1,8 @@ - - + org.eclipse.tycho tycho-build - 2.7.5 + 4.0.6