TCI - Update next target * update jacoco-version to be compatible with Java 17 Change-Id: I1d89a90340bef3f63015386083af261f9e138f70 Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml index fb0bcd0..4661e8d 100644 --- a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml +++ b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
@@ -16,7 +16,7 @@ <properties> - <baseTestArgLine></baseTestArgLine> + <baseTestArgLine>--add-opens java.base/java.lang=ALL-UNNAMED</baseTestArgLine> </properties> <profiles> @@ -28,7 +28,7 @@ </os> </activation> <properties> - <baseTestArgLine>-XstartOnFirstThread</baseTestArgLine> + <baseTestArgLine>--add-opens java.base/java.lang=ALL-UNNAMED -XstartOnFirstThread</baseTestArgLine> </properties> </profile> <profile>
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml index 91465d0..4b35c61 100644 --- a/releng/org.eclipse.emf.ecp.releng/pom.xml +++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -22,7 +22,7 @@ <junit-version>4.12</junit-version> <mav-checkstyle-version>3.1.1</mav-checkstyle-version> <checkstyle-version>8.8</checkstyle-version> - <jacoco-version>0.8.5</jacoco-version> + <jacoco-version>0.8.10</jacoco-version> <jacoco.percentage.instruction>0.5</jacoco.percentage.instruction> <!-- Properties to enable jacoco code coverage analysis with sonar -->
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.target b/releng/org.eclipse.emf.ecp.target.next/next.target index bd880d3..03503f3 100644 --- a/releng/org.eclipse.emf.ecp.target.next/next.target +++ b/releng/org.eclipse.emf.ecp.target.next/next.target
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="ECP RCP" sequenceNumber="1685444500"> +<target name="ECP RCP" sequenceNumber="1685623988"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> @@ -54,6 +54,10 @@ <unit id="org.apache.commons.io.source" version="0.0.0"/> <unit id="org.slf4j.api" version="0.0.0"/> <unit id="org.slf4j.api.source" version="0.0.0"/> + <unit id="javax.annotation" version="0.0.0"/> + <unit id="javax.annotation.source" version="0.0.0"/> + <unit id="javax.inject" version="0.0.0"/> + <unit id="javax.inject.source" version="0.0.0"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.tpd b/releng/org.eclipse.emf.ecp.target.next/next.tpd index d18f51c..bb9acec 100644 --- a/releng/org.eclipse.emf.ecp.target.next/next.tpd +++ b/releng/org.eclipse.emf.ecp.target.next/next.tpd
@@ -53,6 +53,10 @@ org.apache.commons.io.source lazy org.slf4j.api lazy org.slf4j.api.source lazy + javax.annotation lazy + javax.annotation.source lazy + javax.inject lazy + javax.inject.source lazy } location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" {
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.tests/pom.xml b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.tests/pom.xml index dc7feec..ab91158 100644 --- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.tests/pom.xml +++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.tests/pom.xml
@@ -15,7 +15,7 @@ <packaging>pom</packaging> <properties> - <baseTestArgLine></baseTestArgLine> + <baseTestArgLine>--add-opens java.base/java.lang=ALL-UNNAMED</baseTestArgLine> </properties> <profiles>
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml index a140019..a8b7a0a 100644 --- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml +++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml
@@ -20,7 +20,7 @@ <mav-surefire-version>2.22.2</mav-surefire-version> <junit-version>4.12</junit-version> <checkstyle-version>8.5</checkstyle-version> - <jacoco-version>0.8.5</jacoco-version> + <jacoco-version>0.8.10</jacoco-version> <!-- Properties to enable jacoco code coverage analysis with sonar --> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
diff --git a/tests/ECPQ7Tests/pom.xml b/tests/ECPQ7Tests/pom.xml index eb9b7f1..ebde943 100644 --- a/tests/ECPQ7Tests/pom.xml +++ b/tests/ECPQ7Tests/pom.xml
@@ -12,7 +12,7 @@ <rcptt-maven-version>2.5.2</rcptt-maven-version> <build_job>ecp-develop-full</build_job> <currentBuild>https://hudson.eclipse.org/ecp/job/${build_job}/lastSuccessfulBuild/artifact/releng/</currentBuild> - <jacoco-version>0.8.5</jacoco-version> + <jacoco-version>0.8.10</jacoco-version> </properties> <pluginRepositories>