Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2019-09-28 13:59:01 +0000
committerOlivier Constant2019-09-30 09:21:17 +0000
commit43388c6a59bf97580b7d43f2c287bdb6a3454a7d (patch)
treece592045dcf4ed3340dc700279884c50b358e8f4 /releng
parente34615c4eddeca5fff4a10a848ea31e247441794 (diff)
downloadorg.eclipse.emf.diffmerge.core-43388c6a59bf97580b7d43f2c287bdb6a3454a7d.tar.gz
org.eclipse.emf.diffmerge.core-43388c6a59bf97580b7d43f2c287bdb6a3454a7d.tar.xz
org.eclipse.emf.diffmerge.core-43388c6a59bf97580b7d43f2c287bdb6a3454a7d.zip
[releng] TP update to 2019-06
Change-Id: I496ecdff51b49cee163a1d366a344e34024ab83a Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target77
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd19
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product18
4 files changed, 56 insertions, 60 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index f708a9db..eee80928 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -8,7 +8,7 @@
<properties>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <rcptt.version>2.3.0</rcptt.version>
+ <rcptt.version>2.4.3</rcptt.version>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index 523de5a2..0ce114a9 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="org.eclipse.emf.diffmerge" sequenceNumber="1563277297">
- <locations>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
- </location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/cbi/updates/license/"/>
- </location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gef" version="0.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/photon"/>
- </location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/sirius/updates/stable/6.3.0-S20190716-100145/2019-06"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="org.eclipse.emf.diffmerge" sequenceNumber="1569832602">
+ <locations>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
+ <unit id="com.google.guava" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/2019-06"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/sirius/updates/stable/6.3.0-S20190716-100145/2019-06"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
index 721058b3..068f5e68 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
@@ -1,25 +1,22 @@
target "org.eclipse.emf.diffmerge"
-location "http://download.eclipse.org/eclipse/updates/4.8" {
- org.eclipse.equinox.sdk.feature.group lazy
- org.eclipse.jdt.feature.group lazy
- org.eclipse.platform.sdk lazy
-}
-
location "http://download.eclipse.org/cbi/updates/license/" {
- org.eclipse.license.feature.group lazy
+ org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210]
}
-location "http://download.eclipse.org/releases/photon" {
+location "http://download.eclipse.org/releases/2019-06" {
+ org.eclipse.equinox.sdk.feature.group lazy
+ org.eclipse.platform.sdk lazy
+ org.eclipse.jdt.feature.group lazy
org.eclipse.ecf.core.feature.feature.group lazy
org.eclipse.ecf.filetransfer.feature.feature.group lazy
org.eclipse.ecf.core.ssl.feature.feature.group lazy
org.eclipse.ecf.filetransfer.ssl.feature.feature.group lazy
- org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group lazy
- org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group lazy
+ org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group lazy
org.eclipse.draw2d.feature.group lazy
- org.eclipse.gef lazy
+ org.eclipse.gef.feature.group lazy
org.eclipse.jgit.feature.group lazy
+ org.eclipse.jgit.ssh.apache.feature.group lazy
org.eclipse.egit.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
index 17a50554..d8ac2b84 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
@@ -3,6 +3,7 @@
<product name="RCPTT GUI Tests Product" uid="org.eclipse.emf.diffmerge.tests.ui.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+
<configIni use="default">
</configIni>
@@ -13,16 +14,18 @@
<windowImages/>
+
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
</launcher>
+
<vm>
</vm>
+
<plugins>
</plugins>
@@ -31,17 +34,18 @@
<feature id="org.eclipse.emf"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.jdt"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+ <feature id="org.eclipse.ecf.core.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.feature"/>
+ <feature id="org.eclipse.ecf.core.ssl.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
<feature id="org.eclipse.emf.mapping.ecore"/>
<feature id="org.eclipse.help"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
<feature id="org.eclipse.emf.common.ui"/>
<feature id="org.eclipse.emf.codegen"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.equinox.p2.core.feature"/>
<feature id="org.eclipse.emf.mapping.ui"/>
- <feature id="org.eclipse.ecf.core.ssl.feature"/>
- <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
<feature id="org.eclipse.emf.mapping"/>
<feature id="org.eclipse.emf.edit"/>
<feature id="org.eclipse.emf.ecore"/>
@@ -54,10 +58,8 @@
<feature id="org.eclipse.emf.edit.ui"/>
<feature id="org.eclipse.emf.codegen.ecore.ui"/>
<feature id="org.eclipse.rcp"/>
- <feature id="org.eclipse.ecf.core.feature"/>
<feature id="org.eclipse.emf.ecore.editor"/>
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
- <feature id="org.eclipse.ecf.filetransfer.feature"/>
<feature id="org.eclipse.emf.mapping.ecore.editor"/>
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.emf.ecore.edit"/>
@@ -71,8 +73,8 @@
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
</configurations>

Back to the top