Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-03-22 06:37:39 +0000
committerEike Stepper2020-03-22 06:37:39 +0000
commit8626e93601236e9c329872721d72146ae4226f1f (patch)
tree338311eaccb4707b7b9e90caee402bfd10987577
parentca3b7daf2a04ad8654054fd477482c0ae45dd937 (diff)
downloadcdo-8626e93601236e9c329872721d72146ae4226f1f.tar.gz
cdo-8626e93601236e9c329872721d72146ae4226f1f.tar.xz
cdo-8626e93601236e9c329872721d72146ae4226f1f.zip
[Releng] Upgrade to Tycho 1.6.0
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Build (Offline).launch2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target6
-rw-r--r--releng/org.eclipse.emf.cdo.releng/CDO.setup4
6 files changed, 9 insertions, 9 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build (Offline).launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build (Offline).launch
index 58d7e97245..71b3ce0455 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build (Offline).launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build (Offline).launch
@@ -4,7 +4,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.cmd"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DDDtycho.debug.resolver=true&#13;&#10;-DDDX&#13;&#10;-DDDCDO_TESTS=IntegrationTests&#13;&#10;-Dbuild.qualifier=local&#13;&#10;--fail-at-end&#13;&#10;--offline&#13;&#10;clean&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
index a1dfbfafdc..cb295539e7 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
@@ -4,7 +4,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.cmd"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DDDtycho.debug.resolver=true&#13;&#10;-DDDX&#13;&#10;-DDDCDO_TESTS=IntegrationTests&#13;&#10;-DDDskipTests=true&#13;&#10;-Dbuild.qualifier=local&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
index 59828572ed..fa0a856d71 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Clean.launch
@@ -4,7 +4,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.cmd"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean&#13;&#10;-Dtycho.mode=maven"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/pom.xml b/releng/org.eclipse.emf.cdo.releng.parent/pom.xml
index 4dfca26469..dcbd86af3e 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/pom.xml
+++ b/releng/org.eclipse.emf.cdo.releng.parent/pom.xml
@@ -24,7 +24,7 @@ Eike Stepper - initial API and implementation
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.scmUrl>scm:git:https://git.eclipse.org/r/p/cdo/cdo.git</tycho.scmUrl>
- <tycho-version>1.5.0-SNAPSHOT</tycho-version>
+ <tycho-version>1.6.0</tycho-version>
<jarsigner-version>1.1.7</jarsigner-version>
<os-jvm-flags/>
</properties>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
index b63530a51a..b50ebddd0f 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
+++ b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="33">
+<target name="Generated from CDO" sequenceNumber="34">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="0.0.0"/>
@@ -42,8 +42,8 @@
<unit id="org.hsqldb" version="0.0.0"/>
<unit id="org.postgresql" version="0.0.0"/>
<unit id="org.slf4j.api" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2020-03"/>
- <repository location="http://download.eclipse.org/eclipse/updates/I-builds"/>
+ <repository location="http://download.eclipse.org/releases/2020-06"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/latest"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<repository location="http://download.eclipse.org/nebula/snapshot"/>
<repository location="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index 7297be43d2..0c41b01556 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -236,9 +236,9 @@
<repositoryList
name="2020-06">
<repository
- url="http://download.eclipse.org/releases/2020-03"/>
+ url="http://download.eclipse.org/releases/2020-06"/>
<repository
- url="http://download.eclipse.org/eclipse/updates/I-builds"/>
+ url="http://download.eclipse.org/eclipse/updates/latest"/>
<repository
url="http://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<repository

Back to the top