diff --git a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki index d32696e3de..0e10ad806d 100644 --- a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki +++ b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki @@ -4381,7 +4381,7 @@ Alice kills the program, and immediately the server speeds up. She then goes to = Trace Compass Incubator = -To install features from the Trace Compass incubator, use the following update site URL: https://download.eclipse.org/tracecompass.incubator/master/repository/. +To install features from the Trace Compass incubator, use the following update site URL: https://download.eclipse.org/tracecompass.incubator/stable-10.2/repository/. If you're using the Trace Compass RCP, there's an easy method to install incubator features. See the [http://archive.eclipse.org/tracecompass/doc/stable/org.eclipse.tracecompass.rcp.doc.user/Trace-Compass-Incubator.html Trace Compass RCP documentation] diff --git a/doc/org.eclipse.tracecompass.rcp.doc.user/doc/User-Guide.mediawiki b/doc/org.eclipse.tracecompass.rcp.doc.user/doc/User-Guide.mediawiki index 4acc0a1f6b..f7133e7784 100644 --- a/doc/org.eclipse.tracecompass.rcp.doc.user/doc/User-Guide.mediawiki +++ b/doc/org.eclipse.tracecompass.rcp.doc.user/doc/User-Guide.mediawiki @@ -80,7 +80,7 @@ Then click '''Finish'''. It will open Eclipse's main installation wizard. Follow === From an update site === -Optionally, one can also install the incubator features using the following update site URL: https://download.eclipse.org/tracecompass.incubator/master/repository/. +Optionally, one can also install the incubator features using the following update site URL: https://download.eclipse.org/tracecompass.incubator/stable-10.2/repository/. == Update incubator features == diff --git a/pom.xml b/pom.xml index 18d0e1ebc3..c637ae2af8 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ true scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass 1.4.2 - tracecompass-e4.33 + tracecompass-e4.34 https://download.eclipse.org/eclipse/updates/4.23 2.5.4 diff --git a/rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini b/rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini index 386f7d5004..e2c9840a5a 100644 --- a/rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini +++ b/rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini @@ -1,4 +1,7 @@ org.eclipse.e4.ui.css.swt.theme/themeid=org.eclipse.e4.ui.css.theme.e4_default org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true org.eclipse.ui/defaultPerspectiveId=org.eclipse.linuxtools.lttng2.kernel.ui.perspective -org.eclipse.help/HELP_DATA=help_data.xml \ No newline at end of file +org.eclipse.help/HELP_DATA=help_data.xml +# check for updates every time Trace Compass starts. This should only be done in stable releases. +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=499247 +org.eclipse.equinox.p2.ui.sdk.scheduler/enabled=true diff --git a/rcp/org.eclipse.tracecompass.rcp.incubator.ui/plugin.xml b/rcp/org.eclipse.tracecompass.rcp.incubator.ui/plugin.xml index 7299778f75..af22b39b3f 100644 --- a/rcp/org.eclipse.tracecompass.rcp.incubator.ui/plugin.xml +++ b/rcp/org.eclipse.tracecompass.rcp.incubator.ui/plugin.xml @@ -16,7 +16,7 @@ style="push"> + value="https://download.eclipse.org/tracecompass.incubator/stable-10.2/repository/"> diff --git a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product index e76cb7ac3f..f5390663e1 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product @@ -158,7 +158,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + diff --git a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product index 70e40e2242..da90f98359 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product @@ -158,7 +158,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + diff --git a/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product index ac977db60d..8dbf0e5ae3 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product @@ -158,7 +158,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product index 2dbcdcffdd..3fba210f1b 100644 --- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product +++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product @@ -159,7 +159,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml index d60c6c1e14..138b0e22cf 100644 --- a/rcp/org.eclipse.tracecompass.rcp/feature.xml +++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml @@ -287,7 +287,7 @@ + version="9.0.96"/> + version="9.0.96"/> + + diff --git a/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml index 8d6d127928..61cb244ab5 100644 --- a/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml +++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml @@ -2,7 +2,7 @@ + version="9.0.90"/> + version="9.0.90"/> - - diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target index b808bbe0e3..4795428351 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target @@ -1,4 +1,4 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target index ba927cca19..63805c0803 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target @@ -1,4 +1,4 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/tmf/org.eclipse.tracecompass.tmf/p2.inf b/tmf/org.eclipse.tracecompass.tmf/p2.inf index 74888ad50b..3b7448bcb9 100644 --- a/tmf/org.eclipse.tracecompass.tmf/p2.inf +++ b/tmf/org.eclipse.tracecompass.tmf/p2.inf @@ -1,10 +1,10 @@ instructions.configure=\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tracecompass/master/repository);\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tracecompass/master/repository);\ -org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tracecompass.incubator/master/repository);\ -org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tracecompass.incubator/master/repository);\ +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tracecompass.incubator/stable-10.2/repository);\ +org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tracecompass.incubator/stable-10.2/repository);\ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass/master/repository,type:0,name:Trace Compass,enabled:false); \ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass/master/repository,type:1,name:Trace Compass,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass.incubator/master/repository,type:0,name:Trace Compass Incubator,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass.incubator/master/repository,type:1,name:Trace Compass Incubator,enabled:false); +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass.incubator/stable-10.2/repository,type:0,name:Trace Compass Incubator,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tracecompass.incubator/stable-10.2/repository,type:1,name:Trace Compass Incubator,enabled:false);