Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2018-11-12 20:40:16 +0000
committerOlivier Constant2019-01-11 10:46:30 +0000
commit38989cb1ad138e891b81109699a5aecfee26631f (patch)
treed45ade467673c04bab5cc94176dc97d06de962c5 /releng
parent77910987d405ec3b05a8e19aec082d3264698691 (diff)
downloadorg.eclipse.emf.diffmerge.core-38989cb1ad138e891b81109699a5aecfee26631f.tar.gz
org.eclipse.emf.diffmerge.core-38989cb1ad138e891b81109699a5aecfee26631f.tar.xz
org.eclipse.emf.diffmerge.core-38989cb1ad138e891b81109699a5aecfee26631f.zip
[releng] Added tpd file, updated TP, updated RCPTT
Change-Id: Iec5e44615b99b09be3647c4fed508f6f4f8d89ea 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/.project6
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target57
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd31
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product3
5 files changed, 78 insertions, 21 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index c69bf950..ac346963 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -9,7 +9,7 @@
<tycho.version>1.0.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <rcptt.version>2.2.0</rcptt.version>
+ <rcptt.version>2.3.0</rcptt.version>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
</properties>
diff --git a/releng/org.eclipse.emf.diffmerge.target/.project b/releng/org.eclipse.emf.diffmerge.target/.project
index a9799206..abdb3cd4 100644
--- a/releng/org.eclipse.emf.diffmerge.target/.project
+++ b/releng/org.eclipse.emf.diffmerge.target/.project
@@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
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 f27a1f16..cdc78198 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,20 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="org.eclipse.emf.diffmerge" sequenceNumber="28">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.2.v20171108-1834"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
-<unit id="org.eclipse.platform.sdk" version="4.7.2.M20171130-0510"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="5.0.0.201806131550-r"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="6.0.0.201806111309"/>
-<repository location="http://download.eclipse.org/releases/photon"/>
-</location>
-</locations>
-</target> \ No newline at end of file
+<?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="1542096232">
+ <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="1.0.1.v20140414-1359"/>
+ <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="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+ <unit id="com.google.guava" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/photon"/>
+ </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
new file mode 100644
index 00000000..8d52bcca
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
@@ -0,0 +1,31 @@
+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 [1.0.1,1.0.2)
+}
+
+location "http://download.eclipse.org/releases/photon" {
+ 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.draw2d.feature.group lazy
+ org.eclipse.gef lazy
+ org.eclipse.jgit.feature.group lazy
+ org.eclipse.egit.feature.group lazy
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.emf.transaction.sdk.feature.group lazy
+ org.eclipse.emf.validation.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.notation.feature.group lazy
+ org.eclipse.sirius.specifier.feature.group lazy
+ com.google.guava 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 a983a0c5..c34eaf43 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
@@ -63,6 +63,9 @@
<feature id="org.eclipse.emf.ecore.edit"/>
<feature id="org.eclipse.e4.rcp"/>
<feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.11.0.qualifier"/>
+ <feature id="org.eclipse.emf.workspace"/>
+ <feature id="org.eclipse.emf.transaction"/>
+ <feature id="org.eclipse.emf.validation"/>
</features>
<configurations>

Back to the top