feature: Update ote.dependencies.p2 to not have external dependencies
All 3rd party dependencies should come from osee.dep.p2 build
from now on.
Change-Id: Ia6b5b689aa96d3844c7b1903edf9fc07e4c6eebb
diff --git a/org.eclipse.osee.client.ote.feature/feature.xml b/org.eclipse.osee.client.ote.feature/feature.xml
index c2f5c89..6e027af 100644
--- a/org.eclipse.osee.client.ote.feature/feature.xml
+++ b/org.eclipse.osee.client.ote.feature/feature.xml
@@ -66,7 +66,6 @@
<import plugin="org.apache.aries.util"/>
<import plugin="org.osgi.service.blueprint"/>
<import plugin="javax.wsdl"/>
- <import plugin="javax.validation" version="1.1.0" match="greaterOrEqual"/>
<import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
<import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.2" match="greaterOrEqual"/>
<import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2" match="greaterOrEqual"/>
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 e40bce3..e48bc10 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
@@ -21,14 +21,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.birt"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.birt.report.designer.editor.xml.wtp"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.cdt"
version="0.0.0"/>
@@ -77,110 +69,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.cvs"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.connectivity.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.connectivity.oda.designer.core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.connectivity.oda.designer.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.connectivity.oda.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.doc.user"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.apache.derby.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.hsqldb.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.ibm.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.ingres.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.jdbc.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.jdt.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.msft.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.mysql.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.oda.designer.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.oda.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.oracle.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.postgresql.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.sap.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.sqlite.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.enablement.sybase.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.modelbase.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.sqldevtools.ddlgen.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.sqldevtools.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.datatools.sqldevtools.parsers.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.draw2d"
version="0.0.0"/>
@@ -285,7 +173,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.mapping.ui"
+ id="org.eclipse.emf.mwe2.runtime.sdk"
version="0.0.0"/>
<includes
@@ -293,7 +181,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.workspace"
+ id="org.eclipse.emf.transaction.source"
version="0.0.0"/>
<includes
@@ -301,7 +189,19 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.validation.ocl"
+ id="org.eclipse.emf.validation.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.workspace"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.workspace.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.mapping.ui"
version="0.0.0"/>
<includes
@@ -361,22 +261,18 @@
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.gerrit.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.mylyn.monitor"
version="0.0.0"/>
<includes
- id="org.eclipse.mylyn.reviews.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.mylyn_feature"
version="0.0.0"/>
@@ -405,10 +301,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.recommenders.rcp.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.rcp.source"
version="0.0.0"/>
@@ -417,42 +309,14 @@
version="0.0.0"/>
<includes
- id="org.eclipse.tm.terminal.control.feature"
+ id="org.eclipse.wst.common.fproj"
version="0.0.0"/>
<includes
- id="org.eclipse.wb.core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.core.ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.core.xml.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.layout.group.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.rcp.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.swt.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wb.xwt.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.wst.common_core.feature"
version="0.0.0"/>
- <includes
+ <includes
id="org.eclipse.wst.common_ui.feature"
version="0.0.0"/>
@@ -581,6 +445,14 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.equinox.core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.equinox.core.sdk"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.equinox.executable"
version="0.0.0"/>
@@ -603,7 +475,7 @@
<includes
id="org.eclipse.equinox.p2.user.ui"
version="0.0.0"/>
-
+
<includes
id="org.eclipse.team.svn"
version="0.0.0"/>
@@ -625,98 +497,14 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ocl"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ocl.examples"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ocl.ui"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ocl.unified.core"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.bugzilla_feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.builds"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.commons"
- 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.repositories.http"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.mylyn.context_feature"
version="0.0.0"/>
<includes
- id="org.eclipse.mylyn.discovery"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.gerrit.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.git"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.hudson"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.java_feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.monitor"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.reviews.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.mylyn.team_feature"
version="0.0.0"/>
<includes
- id="org.eclipse.mylyn.versions"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn.wikitext_feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.mylyn_feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.ecf.core.feature"
version="0.0.0"/>
@@ -772,46 +560,14 @@
id="org.eclipse.ecf.filetransfer.ssl.feature.source"
version="0.0.0"/>
- <includes
- id="org.eclipse.gmf.examples.runtime.ui.pde"
- version="0.0.0"/>
+ <includes
+ id="org.eclipse.tm.terminal.control.feature"
+ version="0.0.0" />
- <includes
- id="org.eclipse.gmf.examples.runtime"
- version="0.0.0"/>
+ <includes
+ id="org.eclipse.xsd"
+ version="0.0.0" />
- <includes
- id="org.eclipse.gmf.runtime.notation.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.runtime.notation"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.runtime.notation.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.runtime.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.runtime.thirdparty"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.runtime.thirdparty.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.gmf.source"
- version="0.0.0"/>
-
<requires>
<import plugin="org.junit" version="4.12.0" match="equivalent"/>
</requires>
@@ -824,14 +580,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.console.ssh"
+ id="org.apache.commons.cli"
download-size="0"
install-size="0"
version="0.0.0"
@@ -858,124 +607,26 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.xtend"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.cli"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.mwe.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.mwe2.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.concurrent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.commons.net"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xwt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gerrit.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gerrit.reviewdb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gerrit.prettify"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gwt.servlet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gwtjsonrpc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gwtorm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gson"
- download-size="0"
- install-size="0"
- 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.freemarker"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.tools.templates.ui"
download-size="0"
@@ -984,27 +635,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.wst.common.project.facet.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.uriresolver"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xsd"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.mockito"
download-size="0"
install-size="0"
@@ -1019,27 +649,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.orbit.mongodb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.orbit.mongodb.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.launchbar.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
@@ -1047,20 +656,6 @@
unpack="false"/>
<plugin
- id="net.bytebuddy.byte-buddy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="net.bytebuddy.byte-buddy-agent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="com.sun.jna"
download-size="0"
install-size="0"
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 3e24295..95b8282 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.parent/build.sh
@@ -1,4 +1,4 @@
#!/bin/sh
echo
-echo "mvn clean verify -P-mirror-other-sites -V -B -Dosee-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/ -Dosee-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/"
-mvn clean verify -P-mirror-other-sites -V -B -Dosee-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/ -Dosee-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/
+echo "mvn clean verify -P-mirror-other-sites -V -B -Dosee-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/ -Dosee-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/ -Dosee-dep-site=https://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/"
+mvn clean verify -P-mirror-other-sites -V -B -Dosee-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/ -Dosee-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/ -Dosee-dep-site=https://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/
diff --git a/org.eclipse.ote.build/dependencies/ote.dependencies.parent/pom.xml b/org.eclipse.ote.build/dependencies/ote.dependencies.parent/pom.xml
index 10396c2..9180dee 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.parent/pom.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.parent/pom.xml
@@ -10,22 +10,6 @@
<relativePath>../../maven/core</relativePath>
</parent>
- <properties>
- <platform-version-name>photon</platform-version-name>
- <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
- <orbit-version>R20181128170323</orbit-version>
- <mylyn_version>3.16.0</mylyn_version>
- <egit-version>4.4</egit-version>
- <subversive-version>1.0</subversive-version>
- <polarion-version>3.0</polarion-version>
- <xtext-version>2.0.0</xtext-version>
-
-
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository/</orbit-site>
- <egit-site>http://download.eclipse.org/egit/updates</egit-site>
-
- </properties>
-
<groupId>org.eclipse.ote.build</groupId>
<artifactId>ote.dependencies.parent</artifactId>
<packaging>pom</packaging>
@@ -48,59 +32,12 @@
<layout>p2</layout>
<url>${osee-server-site}</url>
</repository>
-
<repository>
- <id>orbit</id>
+ <id>osee-dep</id>
<layout>p2</layout>
- <url>${orbit-site}</url>
- </repository>
-
- <repository>
- <id>subversive</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/technology/subversive/4.0/update-site/</url>
- </repository>
-
- <repository>
- <id>polarion</id>
- <layout>p2</layout>
- <url>http://community.polarion.com/projects/subversive/download/eclipse/6.0/neon-site/</url>
- </repository>
- <!-- <repository>
- <id>itemis</id>
- <layout>p2</layout>
- <url>https://download.itemis.com/updates/</url>
- <url>${local-mirrors-path}/itemis/${xtext-version}/</url>
- </repository>
- <repository>
- <id>checkstyle</id>
- <layout>p2</layout>
- <url>http://checkstyle.org/eclipse-cs/update</url>
- <url>${local-mirrors-path}/checkstyle/release/</url>
- </repository> -->
- <repository>
- <id>emma</id>
- <layout>p2</layout>
-<!-- <url>${local-mirrors-path}/emma/2.3.3/</url> -->
- <url>http://update.eclemma.org</url>
- </repository>
- <repository>
- <id>eclipse-mirror</id>
- <layout>p2</layout>
-<!-- <url>${local-mirrors-path}/eclipse/${platform-version-name}</url> -->
- <url>${eclipse-site}</url>
- </repository>
- <repository>
- <id>wb-mirror</id>
- <layout>p2</layout>
- <!-- <url>${local-mirrors-path}/wb/1.1.0/</url> -->
- <url>http://archive.eclipse.org/windowbuilder/WB/release/R201106211200/3.4/</url>
- </repository>
- <repository>
- <id>egit</id>
- <layout>p2</layout>
- <url>${egit-site}-${egit-version}</url>
- </repository>
+ <url>${osee-dep-site}</url>
+ </repository>
+
</repositories>
</project>
