Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTu Ton2020-07-30 08:09:18 +0000
committerTu Ton2020-08-03 09:21:32 +0000
commit64b83e4be89a2649881fa6b3badfaf659ca58e1a (patch)
tree761563ef48cec1a0e49de55de899eb896d58ac7d
parent519d527f8df3658982b1592d920909ccfd15d718 (diff)
downloadorg.eclipse.emf.diffmerge.core-master.tar.gz
org.eclipse.emf.diffmerge.core-master.tar.xz
org.eclipse.emf.diffmerge.core-master.zip
[releng] Update Eclipse version to 2020-06 and Sirius version toHEADmaster
6.4.0-S20200716-044517 Change-Id: I4a39f6d1602accfc766f30b9d676ceb1abea0ef1 Signed-off-by: Tu Ton <minhtutonthat@gmail.com>
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF4
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml4
-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
4 files changed, 14 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
index 7227dd62..93103060 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.ui,
org.eclipse.emf.diffmerge.connector.core,
org.eclipse.jgit,
- org.eclipse.egit.core;bundle-version="3.6.0",
- org.eclipse.egit.ui;bundle-version="3.6.0"
+ org.eclipse.egit.core,
+ org.eclipse.egit.ui
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.diffmerge.connector.git.EMFDiffMergeGitConnectorPlugin
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index eee80928..9b2bc334 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -8,11 +8,11 @@
<properties>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <rcptt.version>2.4.3</rcptt.version>
+ <rcptt.version>2.5.1</rcptt.version>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <tycho.version>1.0.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..4dff1be2 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="1581953353">
<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-S20200716-044517/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..b0cf7c3a 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-S20200716-044517/2020-06" {
org.eclipse.sirius.specifier.feature.group lazy
}

Back to the top