feature: Update to build with dev branch of org.eclipse.osee
Change-Id: I50440866f1b67844409d00d95a2b41e0a1cc9dc9
diff --git a/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml b/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
index e5e48f0..0ced6c6 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
@@ -21,54 +21,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.cdt"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gdb"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gdb.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.build"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.build.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.debug"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.debug.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.dsf"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.dsf.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.platform"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.platform.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.sdk"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.draw2d"
version="0.0.0"/>
@@ -109,10 +61,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.compare"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.converter"
version="0.0.0"/>
@@ -165,10 +113,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.mwe2.runtime.sdk"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.transaction"
version="0.0.0"/>
@@ -237,38 +181,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.mylyn.commons.identity"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.commons.notifications"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.commons.repositories"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.commons"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.commons.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.discovery"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.monitor"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn_feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osee.framework.ui.feature"
version="0.0.0"/>
@@ -277,10 +189,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.papyrus.sdk.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.pde"
version="0.0.0"/>
@@ -325,26 +233,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.xtend.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.xtext.docs"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.xtext.ui"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.xtext.xbase"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.xtext.runtime"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.nebula.widgets.ganttchart.feature"
version="0.0.0"/>
@@ -481,18 +369,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.team.svn"
- version="0.0.0"/>
-
- <includes
- id="org.polarion.eclipse.team.svn.connector"
- version="0.0.0"/>
-
- <includes
- id="org.polarion.eclipse.team.svn.connector.svnkit18"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osee.core.server.external.feature"
version="0.0.0"/>
@@ -501,14 +377,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.mylyn.context_feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.team_feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.ecf.core.feature"
version="0.0.0"/>
@@ -585,7 +453,7 @@
version="0.0.0"/>
<requires>
- <import plugin="org.junit" version="4.12.0" match="equivalent"/>
+ <import plugin="org.junit" version="4.12.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -617,13 +485,6 @@
unpack="false"/>
<plugin
- id="org.flywaydb.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="com.fasterxml.jackson.core.jackson-core"
download-size="0"
install-size="0"
@@ -765,56 +626,6 @@
unpack="false"/>
<plugin
- id="org.apache.cxf.core.config"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.jaxrs.model.wadl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.jaxrs.provider"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.rs.security.oauth2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.transport.http"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.ws.commons.schema"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.codehaus.stax2"
download-size="0"
install-size="0"
@@ -829,13 +640,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.mwe.utils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.nebula.widgets.ganttchart"
download-size="0"
install-size="0"
@@ -1074,27 +878,6 @@
unpack="false"/>
<plugin
- id="org.apache.cxf.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.jaxrs.client"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.cxf.jaxrs.frontend"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.pool"
download-size="0"
install-size="0"
@@ -1200,13 +983,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.mwe.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.cli"
download-size="0"
install-size="0"
@@ -1333,167 +1109,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ocl.pivot"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.pivot.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.pivot.uml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.base.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.xtext.console"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.debug"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.completeocl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.completeocl.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.essentialocl.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.essentialocl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.oclstdlib"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.oclstdlib.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.oclinecore.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.oclinecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.markup.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.xtext.markup"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.debug.vm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ui.genericeditor"
download-size="0"
install-size="0"
@@ -1501,13 +1116,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ocl.examples.debug.vm.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.gmf.runtime.common.core"
download-size="0"
install-size="0"
@@ -1753,27 +1361,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ocl.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.emf.validation.validity.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ocl.examples.emf.validation.validity"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.m2m.qvt.oml"
download-size="0"
install-size="0"
@@ -1921,13 +1508,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.validation.ocl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.emf.workspace.ui"
download-size="0"
install-size="0"
@@ -2047,13 +1627,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.mwe.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jem.util"
download-size="0"
install-size="0"
@@ -2145,27 +1718,6 @@
unpack="false"/>
<plugin
- id="org.apache.lucene.core"
- download-size="0"
- install-size="0"
- version="6.1.0.v20170814-1820"
- unpack="false"/>
-
- <plugin
- id="org.apache.lucene.queryparser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.lucene.analyzers-common"
- download-size="0"
- install-size="0"
- version="6.1.0.v20161115-1612"
- unpack="false"/>
-
- <plugin
id="org.apache.axis"
download-size="0"
install-size="0"
@@ -2284,32 +1836,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.tools.templates.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.tools.templates.freemarker"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.tools.templates.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.freemarker"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh b/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh
index f311f37..f041e62 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh
@@ -1,8 +1,8 @@
#!/bin/sh
echo
-CLIENT_SITE="http://ci.eclipse.org/osee/job/osee_dev_0.26.0/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.client.all.p2/target/repository/"
-SERVER_SITE="http://ci.eclipse.org/osee/job/osee_dev_0.26.0/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/"
-DEP_SITE="http://ci.eclipse.org/osee/view/OSEE_Developer/job/osee_dev_0.26.0/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.dep.p2/target/repository/"
+CLIENT_SITE="http://ci.eclipse.org/osee/job/osee_dev/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.client.all.p2/target/repository/"
+SERVER_SITE="http://ci.eclipse.org/osee/job/osee_dev/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/"
+DEP_SITE="http://ci.eclipse.org/osee/view/OSEE_Developer/job/osee_dev/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.dep.p2/target/repository/"
echo "mvn clean verify -P-mirror-other-sites -V -B -Dosee-client-site=${CLIENT_SITE} -Dosee-server-site=${SERVER_SITE} -Dosee-dep-site=${DEP_SITE}"
diff --git a/org.eclipse.ote.build/maven/base/pom.xml b/org.eclipse.ote.build/maven/base/pom.xml
index 63bebcb..0532e77 100644
--- a/org.eclipse.ote.build/maven/base/pom.xml
+++ b/org.eclipse.ote.build/maven/base/pom.xml
@@ -7,14 +7,14 @@
<artifactId>base</artifactId>
<packaging>pom</packaging>
<name>Eclipse OTE Maven Repos Parent</name>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.26.1-SNAPSHOT</version>
<properties>
<build-alias>-DEV</build-alias>
- <tycho-version>1.0.0</tycho-version>
- <tychoExtrasVersion>1.0.0</tychoExtrasVersion>
- <platform-version-name>mars</platform-version-name>
- <orbit-version>R20130517111416</orbit-version>
+ <tycho-version>1.7.0</tycho-version>
+ <tychoExtrasVersion>1.7.0</tychoExtrasVersion>
+ <platform-version-name>2020-06/202006171000</platform-version-name>
+ <orbit-version>R20201130205003</orbit-version>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
diff --git a/org.eclipse.ote.build/maven/core/pom.xml b/org.eclipse.ote.build/maven/core/pom.xml
index 14d7ace..bcbea32 100644
--- a/org.eclipse.ote.build/maven/core/pom.xml
+++ b/org.eclipse.ote.build/maven/core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.ote.build</groupId>
<artifactId>base</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.26.1-SNAPSHOT</version>
<relativePath>../base</relativePath>
</parent>
