releng: Build with tracecompass-e4.30 target by default Change-Id: I8ce8d30753a793c81887e058253a066648649c80 Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205091 Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
diff --git a/pom.xml b/pom.xml index 40834d4..3635b7d 100644 --- a/pom.xml +++ b/pom.xml
@@ -57,15 +57,15 @@ <tycho-use-project-settings>true</tycho-use-project-settings> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl> <cbi-plugins.version>1.4.2</cbi-plugins.version> - <target-platform>tracecompass-e4.29</target-platform> + <target-platform>tracecompass-e4.30</target-platform> <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.20</help-docs-eclipserun-repo> <rcptt-version>2.5.4</rcptt-version> <!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) --> <SWT_GTK3>0</SWT_GTK3> - <slf4j-bundle>org.slf4j.binding.simple</slf4j-bundle> - <slf4j-version>1.7.30</slf4j-version> + <slf4j-bundle>slf4j.simple</slf4j-bundle> + <slf4j-version>2.0.9</slf4j-version> <!-- Sonar rule configuration --> <sonar-version>3.9.1.2184</sonar-version>
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product similarity index 98% rename from rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product rename to rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product index beeda40..677e4c6 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="9.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true"> +<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="9.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true"> <aboutInfo> <image path="/org.eclipse.tracecompass.rcp.branding/icons/tc_about.png"/> @@ -142,7 +142,6 @@ <feature id="org.eclipse.tracecompass.rcp.incubator"/> <feature id="org.eclipse.tracecompass.jsontrace"/> <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/> - <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/> <feature id="org.eclipse.tracecompass.tmf.cli"/> <feature id="org.eclipse.equinox.executable"/> </features>
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product index 677e4c6..3613757 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -142,6 +142,7 @@ <feature id="org.eclipse.tracecompass.rcp.incubator"/> <feature id="org.eclipse.tracecompass.jsontrace"/> <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/> + <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/> <feature id="org.eclipse.tracecompass.tmf.cli"/> <feature id="org.eclipse.equinox.executable"/> </features>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml index 2b85d86..23e0106 100644 --- a/rcp/org.eclipse.tracecompass.rcp/feature.xml +++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -30,21 +30,21 @@ </requires> <plugin - id="javax.xml" + id="org.eclipse.orbit.xml-apis-ext" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="javax.activation" + id="jakarta.activation-api" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.json" + id="json" download-size="0" install-size="0" version="0.0.0" @@ -135,7 +135,7 @@ unpack="false"/> <plugin - id="org.apache.commons.io" + id="org.apache.commons.commons-io" download-size="0" install-size="0" version="0.0.0" @@ -303,7 +303,7 @@ unpack="false"/> <plugin - id="org.apache.commons.compress" + id="org.apache.commons.commons-compress" download-size="0" install-size="0" version="0.0.0" @@ -352,7 +352,7 @@ unpack="false"/> <plugin - id="jakarta.xml.bind" + id="jakarta.xml.bind-api" download-size="0" install-size="0" version="0.0.0" @@ -373,14 +373,14 @@ unpack="false"/> <plugin - id="org.slf4j.api" + id="slf4j.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.mozilla.javascript" + id="org.mozilla.rhino" download-size="0" install-size="0" version="0.0.0" @@ -415,17 +415,31 @@ unpack="false"/> <plugin - id="javax.annotation" + id="jakarta.annotation-api" download-size="0" install-size="0" - version="0.0.0" + version="1.3.5" unpack="false"/> <plugin - id="javax.inject" + id="jakarta.annotation-api" download-size="0" install-size="0" - version="0.0.0" + version="2.1.1" + unpack="false"/> + + <plugin + id="jakarta.inject.jakarta.inject-api" + download-size="0" + install-size="0" + version="1.0.5" + unpack="false"/> + + <plugin + id="jakarta.inject.jakarta.inject-api" + download-size="0" + install-size="0" + version="2.0.1" unpack="false"/> <plugin @@ -450,14 +464,210 @@ unpack="false"/> <plugin - id="org.bouncycastle.bcpg" + id="bcpg" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.bouncycastle.bcprov" + id="bcprov" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.mortbay.jasper.apache-jsp" + download-size="0" + install-size="0" + version="9.0.52" + unpack="false"/> + + <plugin + id="com.google.guava.failureaccess" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.commons.logging" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.search.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.servlet-api" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.aries.spifly.dynamic.bundle" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm.commons" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm.util" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm.tree" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm.tree.analysis" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="ch.qos.logback.classic" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="ch.qos.logback.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.batik.css" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.batik.i18n" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.batik.util" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.batik.constants" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.http" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.server" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.session" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.ee8.servlet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.ee8.server" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.util" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.io" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.security" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.ee8.security" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.sun.el.javax.el" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.ibm.icu" download-size="0" install-size="0" version="0.0.0"
diff --git a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml similarity index 66% rename from rcp/org.eclipse.tracecompass.rcp/staging/feature.xml rename to rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml index 23e0106..2b85d86 100644 --- a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml +++ b/rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml
@@ -30,21 +30,21 @@ </requires> <plugin - id="org.eclipse.orbit.xml-apis-ext" + id="javax.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="jakarta.activation-api" + id="javax.activation" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="json" + id="org.json" download-size="0" install-size="0" version="0.0.0" @@ -135,7 +135,7 @@ unpack="false"/> <plugin - id="org.apache.commons.commons-io" + id="org.apache.commons.io" download-size="0" install-size="0" version="0.0.0" @@ -303,7 +303,7 @@ unpack="false"/> <plugin - id="org.apache.commons.commons-compress" + id="org.apache.commons.compress" download-size="0" install-size="0" version="0.0.0" @@ -352,7 +352,7 @@ unpack="false"/> <plugin - id="jakarta.xml.bind-api" + id="jakarta.xml.bind" download-size="0" install-size="0" version="0.0.0" @@ -373,14 +373,14 @@ unpack="false"/> <plugin - id="slf4j.api" + id="org.slf4j.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.mozilla.rhino" + id="org.mozilla.javascript" download-size="0" install-size="0" version="0.0.0" @@ -415,31 +415,17 @@ unpack="false"/> <plugin - id="jakarta.annotation-api" + id="javax.annotation" download-size="0" install-size="0" - version="1.3.5" + version="0.0.0" unpack="false"/> <plugin - id="jakarta.annotation-api" + id="javax.inject" download-size="0" install-size="0" - version="2.1.1" - unpack="false"/> - - <plugin - id="jakarta.inject.jakarta.inject-api" - download-size="0" - install-size="0" - version="1.0.5" - unpack="false"/> - - <plugin - id="jakarta.inject.jakarta.inject-api" - download-size="0" - install-size="0" - version="2.0.1" + version="0.0.0" unpack="false"/> <plugin @@ -464,210 +450,14 @@ unpack="false"/> <plugin - id="bcpg" + id="org.bouncycastle.bcpg" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="bcprov" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.mortbay.jasper.apache-jsp" - download-size="0" - install-size="0" - version="9.0.52" - unpack="false"/> - - <plugin - id="com.google.guava.failureaccess" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.search.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.servlet-api" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.aries.spifly.dynamic.bundle" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.objectweb.asm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.objectweb.asm.commons" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.objectweb.asm.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.objectweb.asm.tree" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.objectweb.asm.tree.analysis" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="ch.qos.logback.classic" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="ch.qos.logback.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.batik.css" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.batik.i18n" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.batik.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.batik.constants" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.http" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.server" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.session" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.ee8.servlet" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.ee8.server" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.io" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.security" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.ee8.security" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.sun.el.javax.el" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.ibm.icu" + id="org.bouncycastle.bcprov" download-size="0" install-size="0" version="0.0.0"
diff --git a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF index f53201c..d8e5a12 100644 --- a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-SymbolicName: org.eclipse.tracecompass.slf4j.binding.simple.properties Bundle-Version: 1.0.2.qualifier Bundle-Vendor: Eclipse Trace Compass -Fragment-Host: org.slf4j.api +Fragment-Host: slf4j.simple Automatic-Module-Name: org.eclipse.tracecompass.slf4j.binding.simple.properties Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/legacy/MANIFEST.MF similarity index 92% rename from releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF rename to releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/legacy/MANIFEST.MF index 8482288..99663b9 100644 --- a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF +++ b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/legacy/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-SymbolicName: org.eclipse.tracecompass.slf4j.binding.simple.properties Bundle-Version: 1.0.1.qualifier Bundle-Vendor: Eclipse Trace Compass -Fragment-Host: slf4j.simple +Fragment-Host: org.slf4j.api Automatic-Module-Name: org.eclipse.tracecompass.slf4j.binding.simple.properties Bundle-RequiredExecutionEnvironment: JavaSE-11