Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorPhilippe DUL2020-10-12 11:26:22 +0000
committerPhilippe DUL2020-10-12 11:27:16 +0000
commit369bccf3f3456bd46ae0dcde682c3e0c79c25d45 (patch)
tree2d65eb5b3154a4d93ad168c0b3cf0727a98a9511 /releng
parent6f2907f66eb9081d487175c25c4518259307f359 (diff)
parent209b47a92b6bdd49dbf752a77611b56abd038734 (diff)
downloadorg.eclipse.emf.diffmerge.core-master.tar.gz
org.eclipse.emf.diffmerge.core-master.tar.xz
org.eclipse.emf.diffmerge.core-master.zip
Merge branch 'master' into genericHEADmastergeneric
Change-Id: I388e9d4edc0551e37f90650d32ee95c5263c065b Signed-off-by: Philippe DUL <philippe.dul@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.target10
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd6
3 files changed, 11 insertions, 7 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 76c9edc6..4c2e5762 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -16,7 +16,7 @@
<maven.dependency.version>2.10</maven.dependency.version>
<maven.resources.version>3.1.0</maven.resources.version>
<maven.toolchains.version>1.1</maven.toolchains.version>
- <tycho.version>1.4.0</tycho.version>
+ <tycho.version>1.7.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
</properties>
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 5e39c09f..a4bf75c5 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,7 +1,7 @@
<?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="1581953352">
+<target name="org.eclipse.emf.diffmerge" sequenceNumber="1581953354">
<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"/>
@@ -20,6 +20,8 @@
<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.jgit.ssh.jsch.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.http.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"/>
@@ -27,11 +29,11 @@
<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"/>
+ <repository location="http://download.eclipse.org/releases/2020-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="http://download.eclipse.org/sirius/updates/releases/6.3.0/2019-06"/>
+ <repository location="https://download.eclipse.org/sirius/updates/stable/6.4.0-S20200921-043506/2020-06"/>
</location>
</locations>
-</target>
+</target> \ No newline at end of file
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 6f07b1ba..e37acbf0 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
@@ -4,7 +4,7 @@ location "http://download.eclipse.org/cbi/updates/license/" {
org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210]
}
-location "http://download.eclipse.org/releases/2019-06" {
+location "http://download.eclipse.org/releases/2020-06" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.sdk lazy
org.eclipse.jdt.feature.group lazy
@@ -17,6 +17,8 @@ location "http://download.eclipse.org/releases/2019-06" {
org.eclipse.gef.feature.group lazy
org.eclipse.jgit.feature.group lazy
org.eclipse.jgit.ssh.apache.feature.group lazy
+ org.eclipse.jgit.ssh.jsch.feature.group lazy
+ org.eclipse.jgit.http.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
@@ -25,6 +27,6 @@ location "http://download.eclipse.org/releases/2019-06" {
org.eclipse.gmf.runtime.notation.feature.group lazy
com.google.guava lazy
}
-location "http://download.eclipse.org/sirius/updates/releases/6.3.0/2019-06" {
+location "https://download.eclipse.org/sirius/updates/stable/6.4.0-S20200921-043506/2020-06" {
org.eclipse.sirius.specifier.feature.group lazy
}

Back to the top