diff options
author | Patrick Tasse | 2023-11-21 18:59:42 +0000 |
---|---|---|
committer | Patrick Tasse | 2023-11-22 19:22:17 +0000 |
commit | 3aec3379cd3babc49661ba1aaaa1d3f0c18d9694 (patch) | |
tree | 1cb0bfef6f93817a524462511ec85f94f10c6b8b | |
parent | c367de6c06d70a63986fadb92a7bb1769a088b6f (diff) | |
download | org.eclipse.tracecompass-3aec3379cd3babc49661ba1aaaa1d3f0c18d9694.tar.gz org.eclipse.tracecompass-3aec3379cd3babc49661ba1aaaa1d3f0c18d9694.tar.xz org.eclipse.tracecompass-3aec3379cd3babc49661ba1aaaa1d3f0c18d9694.zip |
releng: Update e4.30 and eStaging targets for 2023-12 RC1
Change-Id: Ifef9600957703218007f8700448d9df37267306e
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205591
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
6 files changed, 19 insertions, 14 deletions
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product index 5b7f2b0f6a..2168e9d8bd 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product @@ -141,6 +141,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U <feature id="org.eclipse.ecf.filetransfer.feature"/> <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"/> diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target index 5a06f22516..f058c64297 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.30" sequenceNumber="3"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.30" sequenceNumber="4"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/> @@ -7,7 +7,7 @@ <unit id="org.eclipse.remote.ui" version="0.0.0"/> <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/> <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/> -<repository location="https://download.eclipse.org/tools/cdt/builds/11.4/cdt-11.4.0-m1/"/> +<repository location="https://download.eclipse.org/tools/cdt/builds/11.4/cdt-11.4.0-rc1a/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> @@ -39,7 +39,7 @@ <unit id="org.mozilla.rhino" version="1.7.14"/> <unit id="slf4j.api" version="0.0.0"/> <unit id="slf4j.simple" version="0.0.0"/> -<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202311141131/"/> +<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="0.0.0"/> @@ -62,7 +62,7 @@ <unit id="org.eclipse.ui.views.log" version="0.0.0"/> <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/> <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> -<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231109-0710/"/> +<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231115-1800/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/> @@ -76,7 +76,7 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.xsd" version="0.0.0"/> -<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202310150521/"/> +<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/> diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target index 2ed3088683..f9546ae805 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="220"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="221"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/> @@ -7,7 +7,7 @@ <unit id="org.eclipse.remote.ui" version="0.0.0"/> <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/> <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/> -<repository location="https://download.eclipse.org/tools/cdt/builds/11.4/cdt-11.4.0-m1/"/> +<repository location="https://download.eclipse.org/tools/cdt/builds/11.4/cdt-11.4.0-rc1a/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> @@ -39,7 +39,7 @@ <unit id="org.mozilla.rhino" version="1.7.14"/> <unit id="slf4j.api" version="0.0.0"/> <unit id="slf4j.simple" version="0.0.0"/> -<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202311141131/"/> +<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="0.0.0"/> @@ -62,7 +62,7 @@ <unit id="org.eclipse.ui.views.log" version="0.0.0"/> <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/> <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> -<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231109-0710/"/> +<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231115-1800/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/> @@ -76,7 +76,7 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.xsd" version="0.0.0"/> -<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202310150521/"/> +<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/> diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tmf/org.eclipse.tracecompass.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs index b1b12448ca..4e67ac0b10 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -89,7 +89,7 @@ org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariable org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error org.eclipse.jdt.core.compiler.problem.potentialNullReference=error org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=error +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF index 1189dc2cb7..c73adf6247 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF @@ -144,6 +144,7 @@ Import-Package: com.google.common.annotations, com.google.gson.annotations, com.google.gson.reflect, com.google.gson.stream, + org.apache.commons.compress.archivers, org.apache.commons.compress.archivers.tar, org.apache.commons.compress.archivers.zip, org.apache.commons.compress.compressors.gzip, diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarFile.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarFile.java index 806a44da47..8922d01589 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarFile.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TarFile.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; +import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; @@ -64,7 +65,8 @@ public class TarFile { } entryEnumerationStream = new TarArchiveInputStream(fInputStream); try { - curEntry = (TarArchiveEntry) entryEnumerationStream.getNextEntry(); + ArchiveEntry nextEntry = entryEnumerationStream.getNextEntry(); + curEntry = (TarArchiveEntry) nextEntry; if (curEntry == null || !curEntry.isCheckSumOK()) { throw new IOException("Error detected parsing initial entry header"); //$NON-NLS-1$ } @@ -114,7 +116,8 @@ public class TarFile { public TarArchiveEntry nextElement() { TarArchiveEntry oldEntry = curEntry; try { - curEntry = (TarArchiveEntry) entryEnumerationStream.getNextEntry(); + ArchiveEntry nextEntry = entryEnumerationStream.getNextEntry(); + curEntry = (TarArchiveEntry) nextEntry; } catch(IOException e) { curEntry = null; } |