Merge branch 'master' into Run_config_bug

pitest · Jul 27, 2022 · 87bab65 · 87bab65
2 parents 534edec + 87823bb
commit 87bab65
Show file tree

Hide file tree

Showing 29 changed files with 189 additions and 4 deletions.
diff --git a/.github/workflows/check-installation.yml b/.github/workflows/check-installation.yml
@@ -0,0 +1,36 @@
+name: Check Installation with p2 site
+
+on:
+  pull_request:
+    paths-ignore:
+     - '**.md'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        eclipse-version: ['2022-06', 'oxygen']
+      fail-fast: false
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      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
+      with:
+        java-version: 11
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.m2
+        key: ${{ runner.os }}-p2-${{ hashFiles('**/pom.xml', '**/*.yml', '**/*.target') }}
+        restore-keys: ${{ runner.os }}-p2-
+    - name: Verify Installation
+      run: >
+         mvn verify -Pverify-installation -Dmaven.test.skip=true -Declipse-version=${{ matrix.eclipse-version }}
+    - name: Show installed contents
+      run: tree /home/runner/work/pitclipse/pitclipse/releng/org.pitest.pitclipse.p2/target/installed-plugins
diff --git a/bundles/org.pitest.pitclipse.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.launch.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.launch.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.launch/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.launch/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.listeners/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.listeners/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.preferences.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.preferences.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.runner/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.runner/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitclipse.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitclipse.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.core.resources.prefs b/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.pitest.feature/.settings/org.eclipse.core.resources.prefs b/features/org.pitest.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.pitest.pitclipse.core.feature/.settings/org.eclipse.core.resources.prefs b/features/org.pitest.pitclipse.core.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.pitest.pitclipse.ui.feature/.settings/org.eclipse.core.resources.prefs b/features/org.pitest.pitclipse.ui.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,12 @@
 		<github-local-clone>${project.build.directory}/checkout</github-local-clone>
 		<releases-directory>${github-local-clone}/releases</releases-directory>
 		<current-release-directory>${releases-directory}/${qualifiedVersion}</current-release-directory>
-		<eclipse-version>oxygen</eclipse-version>
+
+		<!-- This is used for tycho-eclipserun-plugin for managing composite update sites
+			and for verifying that we can install our features from our p2 site.
+			If we change this, we have to change it accordingly also in
+			.github/workflows/check-installation.yml -->
+		<eclipse-version>2022-06</eclipse-version>
 
 		<!-- For target platform -->
 		<!-- This can be replaced on the command line, e.g.,

diff --git a/releng/org.pitest.pitclipse.p2/.settings/org.eclipse.core.resources.prefs b/releng/org.pitest.pitclipse.p2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/org.pitest.pitclipse.p2/pom.xml b/releng/org.pitest.pitclipse.p2/pom.xml
@@ -13,6 +13,13 @@
 	<artifactId>org.pitest.pitclipse.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
 
+	<properties>
+		<!-- for verifying our p2 repository and its references -->
+		<build.destination>${project.build.directory}/installed-plugins</build.destination>
+		<features>org.pitest.pitclipse.ui.feature.feature.group</features>
+		<sites>file:/${project.build.directory}/repository,https://download.eclipse.org/releases/${eclipse-version}</sites>
+	</properties>
+
 	<build>
 		<plugins>
 			<!-- make sure that zipped p2 repositories have the fully qualified
@@ -215,6 +222,92 @@
 				</plugins>
 			</build>
 		</profile>
+
+		<profile>
+			<!-- Activate this profile to check that we can install Pitclipse features
+				through its update site (and the Eclipse update site) -->
+			<id>verify-installation</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<configuration>
+							<repositories>
+								<repository>
+									<id>${eclipse-version}</id>
+									<layout>p2</layout>
+									<url>https://download.eclipse.org/releases/${eclipse-version}</url>
+								</repository>
+							</repositories>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.ds</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.core.net</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<id>verify-feature-installation</id>
+								<configuration>
+									<jvmArgs>-Declipse.p2.mirrors=true</jvmArgs>
+									<applicationsArgs>
+										<args>-consoleLog</args>
+										<args>-application</args>
+										<args>org.eclipse.equinox.p2.director</args>
+										<args>-nosplash</args>
+										<args>-followReferences</args>
+										<args>-destination</args>
+										<args>${build.destination}</args>
+										<args>-repository</args>
+										<args>${sites}</args>
+										<args>-installIUs</args>
+										<args>${features}</args>
+									</applicationsArgs>
+								</configuration>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>verify</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 </project>
diff --git a/releng/org.pitest.pitclipse.target/.settings/org.eclipse.core.resources.prefs b/releng/org.pitest.pitclipse.target/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="org.pitest.pitclipse.target" sequenceNumber="7">
+<target name="org.pitest.pitclipse.target" sequenceNumber="9">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="0.0.0"/>
@@ -10,13 +10,15 @@
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/2021-06"/>
+			<repository location="https://download.eclipse.org/releases/2022-06"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.guava" version="0.0.0"/>
 			<unit id="com.google.guava.source" version="0.0.0"/>
 			<unit id="org.apache.commons.lang3" version="0.0.0"/>
 			<unit id="org.apache.commons.lang3.source" version="0.0.0"/>
+			<unit id="org.apache.log4j" version="0.0.0"/>
+			<unit id="org.apache.log4j.source" version="0.0.0"/>
 			<unit id="org.hamcrest.core" version="0.0.0"/>
 			<unit id="org.hamcrest.core.source" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>

diff --git a/tests/io.cucumber/.settings/org.eclipse.core.resources.prefs b/tests/io.cucumber/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.pitest.pitclipse.runner.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.pitest.pitclipse.runner.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.pitest.pitclipse.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.pitest.pitclipse.ui.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF
@@ -25,4 +25,5 @@ Require-Bundle: org.eclipse.swtbot.eclipse.finder,
  org.pitest.pitclipse.launch.ui;bundle-version="2.0.0",
  org.pitest.pitclipse.preferences.ui;bundle-version="2.0.0",
  io.cucumber;bundle-version="4.3.0",
- org.eclipse.debug.core
+ org.eclipse.debug.core,
+ org.slf4j.api
diff --git a/tests/testprojects/.settings/org.eclipse.core.resources.prefs b/tests/testprojects/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...projects/org.pitest.pitclipse.testprojects.bar/.settings/org.eclipse.core.resources.prefs b/...projects/org.pitest.pitclipse.testprojects.bar/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...org.pitest.pitclipse.testprojects.emptyclasses/.settings/org.eclipse.core.resources.prefs b/...org.pitest.pitclipse.testprojects.emptyclasses/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...projects/org.pitest.pitclipse.testprojects.foo/.settings/org.eclipse.core.resources.prefs b/...projects/org.pitest.pitclipse.testprojects.foo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...jects/org.pitest.pitclipse.testprojects.foobar/.settings/org.eclipse.core.resources.prefs b/...jects/org.pitest.pitclipse.testprojects.foobar/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...g.pitest.pitclipse.testprojects.jupiterproject/.settings/org.eclipse.core.resources.prefs b/...g.pitest.pitclipse.testprojects.jupiterproject/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...ects/org.pitest.pitclipse.testprojects.nonjava/.settings/org.eclipse.core.resources.prefs b/...ects/org.pitest.pitclipse.testprojects.nonjava/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...s/org.pitest.pitclipse.testprojects.twoclasses/.settings/org.eclipse.core.resources.prefs b/...s/org.pitest.pitclipse.testprojects.twoclasses/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8