More stable-7.1 changes
- bump up mylyn to 2.1
- fix output locations
- fix mirror locations
Change-Id: If46431f810ae63ed45b1e3213d42a0fd1a7ced70
Reviewed-on: https://git.eclipse.org/r/133614
Tested-by: CI Bot
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/feature.xml b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/feature.xml
index 638c231..7ce3eba 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/feature.xml
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.mylyn.osio.rest.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="2.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/pom.xml b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/pom.xml
index 7276515..af390ce 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/pom.xml
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest-feature/pom.xml
@@ -14,11 +14,11 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.mylyn</artifactId>
- <version>1.0.0</version>
+ <version>2.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.mylyn.osio.rest.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools OpenShift.io Mylyn Connector Feature</name>
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core.tests/META-INF/MANIFEST.MF b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core.tests/META-INF/MANIFEST.MF
index fa08a34..eaf5ea4 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core.tests/META-INF/MANIFEST.MF
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Mylyn OSIO Rest Connector Core Tests
Bundle-SymbolicName: org.eclipse.linuxtools.mylyn.osio.rest.core.tests;singleton:=true
Bundle-Activator: org.eclipse.linuxtools.mylyn.osio.rest.core.tests.Activator
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: Eclipse Linux Tools
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF
index 89df0d3..446eac7 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.linuxtools.mylyn.osio.rest.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: %Vendor.name
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/pom.xml b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/pom.xml
index 7c86d35..0151718 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/pom.xml
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/pom.xml
@@ -4,10 +4,10 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.mylyn</artifactId>
- <version>1.0.0</version>
+ <version>2.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.mylyn.osio.rest.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/META-INF/MANIFEST.MF b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/META-INF/MANIFEST.MF
index 331852e..6bcbf4c 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/META-INF/MANIFEST.MF
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ui
Bundle-SymbolicName: org.eclipse.linuxtools.mylyn.osio.rest.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.mylyn.osio.rest.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/pom.xml b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/pom.xml
index 94bf1a7..acb12ec 100644
--- a/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/pom.xml
+++ b/mylyn/org.eclipse.linuxtools.mylyn.osio.rest.ui/pom.xml
@@ -4,10 +4,10 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.mylyn</artifactId>
- <version>1.0.0</version>
+ <version>2.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.mylyn.osio.rest.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/mylyn/pom.xml b/mylyn/pom.xml
index 2a40cb1..88da70a 100644
--- a/mylyn/pom.xml
+++ b/mylyn/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.mylyn</artifactId>
- <version>1.0.0</version>
+ <version>2.1.0</version>
<packaging>pom</packaging>
<parent>
diff --git a/pom.xml b/pom.xml
index 991950d..c36b574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,9 @@
</distributionManagement>
<properties>
- <mirror-repo-name>updates-nightly</mirror-repo-name>
- <mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name>
- <mirror-mylyn-repo-name>updates-mylyn-nightly</mirror-mylyn-repo-name>
+ <mirror-repo-name>update-7.1</mirror-repo-name>
+ <mirror-docker-repo-name>update-docker-4.1</mirror-docker-repo-name>
+ <mirror-mylyn-repo-name>update-mylyn-2.1</mirror-mylyn-repo-name>
<tycho-version>1.3.0-SNAPSHOT</tycho-version>
<tycho-extras-version>1.3.0-SNAPSHOT</tycho-extras-version>
<target-platform>linuxtools-e4.10</target-platform>
diff --git a/releng/org.eclipse.linuxtools.docker-site/pom.xml b/releng/org.eclipse.linuxtools.docker-site/pom.xml
index 40c8518..2f77af7 100644
--- a/releng/org.eclipse.linuxtools.docker-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/pom.xml
@@ -44,12 +44,12 @@
<target>
<delete includeemptydirs="false">
<fileset
- dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-docker-nightly">
+ dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-docker-nightly-4.1">
<include name="**" />
</fileset>
</delete>
<copy includeemptydirs="false"
- todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-docker-nightly">
+ todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-docker-nightly-4.1">
<fileset dir="target/repository">
<include name="**" />
</fileset>
diff --git a/releng/org.eclipse.linuxtools.mylyn-site/pom.xml b/releng/org.eclipse.linuxtools.mylyn-site/pom.xml
index 7a287ba..4121e25 100644
--- a/releng/org.eclipse.linuxtools.mylyn-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.mylyn-site/pom.xml
@@ -44,12 +44,12 @@
<target>
<delete includeemptydirs="false">
<fileset
- dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-mylyn-nightly">
+ dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-mylyn-nightly-2.1">
<include name="**" />
</fileset>
</delete>
<copy includeemptydirs="false"
- todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-mylyn-nightly">
+ todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-mylyn-nightly-2.1">
<fileset dir="target/repository">
<include name="**" />
</fileset>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index 2ea1e1b..0e04f84 100644
--- a/releng/org.eclipse.linuxtools.releng-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml
@@ -44,12 +44,12 @@
<target>
<delete includeemptydirs="false">
<fileset
- dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly">
+ dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly-7.1">
<include name="**" />
</fileset>
</delete>
<copy includeemptydirs="false"
- todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly">
+ todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly-7.1">
<fileset dir="target/repository">
<include name="**" />
</fileset>
