Create e4.19 target and use it to build. Linux Tools should stop contributing old versions of gson, glassfish-hk2 and xerces to the simrel. Change-Id: I9ab2c834450c4de149a5ba808874b6422927ff5c Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/c/linuxtools/org.eclipse.linuxtools/+/175037 Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/pom.xml b/pom.xml index 6be5523..0c81fb9 100644 --- a/pom.xml +++ b/pom.xml
@@ -52,7 +52,7 @@ <mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name> <mirror-mylyn-repo-name>updates-mylyn-nightly</mirror-mylyn-repo-name> <tycho-version>2.2.0</tycho-version> - <target-platform>linuxtools-e4.18</target-platform> + <target-platform>linuxtools-e4.19</target-platform> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
diff --git a/releng/org.eclipse.linuxtools.releng-site/category.xml b/releng/org.eclipse.linuxtools.releng-site/category.xml index a8b8f89..4be1767 100644 --- a/releng/org.eclipse.linuxtools.releng-site/category.xml +++ b/releng/org.eclipse.linuxtools.releng-site/category.xml
@@ -80,9 +80,6 @@ <iu id="org.apache.xml.resolver" version="0.0.0"> <category name="Linux Tools"/> </iu> - <iu id="org.apache.xml.serializer" version="0.0.0"> - <category name="Linux Tools"/> - </iu> <iu id="javax.xml" version="0.0.0"> <category name="Linux Tools"/> </iu>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.19.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.19.target new file mode 100644 index 0000000..04a2a72 --- /dev/null +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.19.target
@@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?> +<target name="linuxtools-e4.19" sequenceNumber="1"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.3.v20200512-1600"/> +<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.3.v20200512-1600"/> +<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.3.v20200512-1600"/> +<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.3.v20200512-1600"/> +<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.3.v20200512-1600"/> +<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.3.v20200512-1600"/> +<unit id="com.github.jnr.constants" version="0.9.15.v20200501-1917"/> +<unit id="com.github.jnr.enxio" version="0.25.0.v20200501-1917"/> +<unit id="com.github.jnr.ffi" version="2.1.12.v20200513-1859"/> +<unit id="com.github.jnr.jffi" version="1.2.23.v20200501-1917"/> +<unit id="com.github.jnr.jffi.native" version="1.2.23.v20200501-1917"/> +<unit id="com.github.jnr.posix" version="3.0.54.v20200501-1917"/> +<unit id="com.github.jnr.unixsocket" version="0.28.0.v20200501-1917"/> +<unit id="com.google.gson" version="2.8.6.v20201231-1626"/> +<unit id="com.google.guava" version="27.1.0.v20190517-1946"/> +<unit id="org.mandas.docker-client" version="3.2.1.v20200519-1937"/> +<unit id="org.mandas.docker-client.source" version="3.2.1.v20200519-1937"/> +<unit id="javassist" version="3.13.0.GA_v201209210905"/> +<unit id="javax.ws.rs" version="2.1.6.v20200505-2127"/> +<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> +<unit id="javax.xml.stream" version="1.0.1.v201004272200"/> +<unit id="com.github.jnr.x86asm" version="1.0.2.v20200501-1917"/> +<unit id="org.aopalliance" version="1.0.0.v201105210816"/> +<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> +<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/> +<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/> +<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/> +<unit id="org.apache.xerces" version="2.12.1.v20210115-0812"/> +<unit id="org.assertj" version="3.14.0.v20200120-1926"/> +<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> +<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> +<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/> +<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/> +<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/> +<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/> +<unit id="org.glassfish.hk2.utils" version="2.6.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.apache.connector" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.containers.servlet" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20200513-1859"/> +<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/> +<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20200513-1859"/> +<unit id="org.mockito" version="2.23.0.v20200310-1642"/> +<unit id="org.objectweb.asm" version="9.0.0.v20201001-1419"/> +<unit id="org.objectweb.asm.analysis" version="9.0.0.v20201001-1419"/> +<unit id="org.objectweb.asm.tree" version="9.0.0.v20201001-1419"/> +<unit id="org.objectweb.asm.util" version="9.0.0.v20201001-1419"/> +<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> +<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210115215641/repository"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.jdt.annotation" version="0.0.0"/> +<unit id="org.eclipse.jdt.core" version="0.0.0"/> +<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/> +<unit id="org.eclipse.jdt.ui" version="0.0.0"/> +<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/> +<unit id="org.eclipse.pde.runtime" version="0.0.0"/> +<unit id="org.eclipse.platform.ide" version="0.0.0"/> +<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/> +<repository location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.license.feature.group" version="0.0.0"/> +<repository location="https://download.eclipse.org/cbi/updates/license"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/> +<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/> +<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/> +<repository location="https://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> +<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> +<unit id="org.eclipse.dstore.core" version="0.0.0"/> +<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/> +<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/> +<unit id="org.eclipse.remote.feature.group" version="0.0.0"/> +<unit id="org.eclipse.zest.feature.group" version="0.0.0"/> +<unit id="org.eclipse.lsp4e" version="0.0.0"/> +<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/> +<repository location="https://download.eclipse.org/staging/2020-12/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/> +<repository location="https://download.eclipse.org/reddeer/releases/latest/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/> +<repository location="https://download.eclipse.org/swtchart/integration/develop/repository"/> +</location> +</locations> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> +<launcherArgs> +<vmArgs>-Xms40m +-Xmx512M</vmArgs> +<programArgs>-consolelog</programArgs> +</launcherArgs> +</target> \ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.target/pom.xml b/releng/org.eclipse.linuxtools.target/pom.xml index e695675..3c8703c 100644 --- a/releng/org.eclipse.linuxtools.target/pom.xml +++ b/releng/org.eclipse.linuxtools.target/pom.xml
@@ -31,9 +31,9 @@ <configuration> <artifacts> <artifact> - <file>linuxtools-e4.18.target</file> + <file>linuxtools-e4.19.target</file> <type>target</type> - <classifier>linuxtools-e4.18</classifier> + <classifier>linuxtools-e4.19</classifier> </artifact> <!-- More targets could be added here --> </artifacts>