feature: Update to build with OSEE Dev
Change-Id: Ibfead7a041efdae580557ec3edfd8efef626a6d9
diff --git a/org.eclipse.osee.ote.master.product/customize-product.xml b/org.eclipse.osee.ote.master.product/customize-product.xml
index 2ebba86..f4da4b5 100644
--- a/org.eclipse.osee.ote.master.product/customize-product.xml
+++ b/org.eclipse.osee.ote.master.product/customize-product.xml
@@ -18,12 +18,6 @@
<updateProduct os="win32" ws="win32" arch="x86_64" jreVersion="1.8.0_45" />
<updateProduct os="linux" ws="gtk" arch="x86_64" jreVersion="1.8.0_45" />
<updateProduct os="macosx" ws="cocoa" arch="x86_64" jreVersion="_" />
-
- <!--
- <updateProduct os="solaris" ws="gtk" arch="sparc" jreVersion="1.6.0_24" />
- <updateProduct os="macosx" ws="carbon" arch="x86" jreVersion="_" />
- <updateProduct os="macosx" ws="cocoa" arch="x86" jreVersion="_" />
- -->
</target>
<!-- *************************************************************** -->
diff --git a/org.eclipse.osee.ote.parent/build.sh b/org.eclipse.osee.ote.parent/build.sh
index c4b1841..e3fcce1 100644
--- a/org.eclipse.osee.ote.parent/build.sh
+++ b/org.eclipse.osee.ote.parent/build.sh
@@ -2,6 +2,6 @@
echo
pwd
echo
-echo "mvn clean verify -Dosee.base.p2=$1 -Dosee-build-stage=nothing -Dno-extern-repos"
+echo "mvn clean verify -Dote.dependencies.p2=$1 -Dosee-build-stage=nothing -Dno-extern-repos"
echo
-mvn clean verify -Dosee.base.p2=$1 -Dosee-build-stage=nothing -Dno-extern-repos
+mvn clean verify -Dote.dependencies.p2=$1 -Dosee-build-stage=nothing -Dno-extern-repos
diff --git a/org.eclipse.osee.ote.parent/buildLocal.sh b/org.eclipse.osee.ote.parent/buildLocal.sh
index 472b463..1dc4655 100644
--- a/org.eclipse.osee.ote.parent/buildLocal.sh
+++ b/org.eclipse.osee.ote.parent/buildLocal.sh
@@ -1,4 +1,4 @@
#!/bin/sh
export BASE_AREA=`pwd | sed 's/\/c\//\/c\:\//'`
-echo "mvn clean verify -Dosee.base.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/"
-mvn clean verify -Dosee.base.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/
\ No newline at end of file
+echo "mvn clean verify -Dote.dependencies.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/"
+mvn clean verify -Dote.dependencies.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/
\ No newline at end of file
diff --git a/org.eclipse.osee.ote.parent/pom.xml b/org.eclipse.osee.ote.parent/pom.xml
index 6e6a978..773cdeb 100644
--- a/org.eclipse.osee.ote.parent/pom.xml
+++ b/org.eclipse.osee.ote.parent/pom.xml
@@ -206,17 +206,7 @@
<!-- optional excludes -->
<configuration>
<excludes>
- <!-- Hopefully these will be removed from here once the jetty source issue is resolved.
- Right now, there are two jetty versions included in the ote.dependencies.p2 build
- but only one source, and it causes a build error. This is due to the current
- 0.26.0 OSEE build needing newer versions than are in Photon. When the OSEE build
- moves past Photon, these bundles should be able to be removed from here. -->
- <plugin id="org.eclipse.jetty.http" />
- <plugin id="org.eclipse.jetty.io" />
- <plugin id="org.eclipse.jetty.security" />
- <plugin id="org.eclipse.jetty.server" />
- <plugin id="org.eclipse.jetty.servlet" />
- <plugin id="org.eclipse.jetty.util" />
+ <!-- plugin sources to exclude -->
</excludes>
</configuration>
</plugin>
@@ -374,44 +364,17 @@
</repositories>
</profile>
<profile>
- <id>client-external-p2</id>
+ <id>ote.dependencies.p2</id>
<activation>
<property>
- <name>osee-build-stage</name>
- <value>!osee-all-server</value>
- </property>
- </activation>
- <properties>
- <!--<nebula-site>http://download.eclipse.org/technology/nebula/snapshot</nebula-site> -->
- <!--<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site> -->
- <!--<subversive-site>http://download.eclipse.org/technology/subversive/${subversive-version}/update-site</subversive-site> -->
- <!-- <polarion-site>http://community.polarion.com/projects/subversive/download/eclipse/${polarion-version}/update-site</polarion-site> -->
- <!-- <egit-site>http://download.eclipse.org/egit/updates</egit-site> -->
- </properties>
- <repositories>
- <!-- <repository> <id>nebula</id> <layout>p2</layout> <url>${nebula-site}</url>
- </repository> -->
- <!-- <repository> <id>wikitext</id> <layout>p2</layout> <url>${wikitext-site}</url>
- </repository> -->
- <!-- <repository> <id>polarion</id> <layout>p2</layout> <url>${polarion-site}</url>
- </repository> <repository> <id>subversive</id> <layout>p2</layout> <url>${subversive-site}</url>
- </repository> -->
- <!-- <repository> <id>egit</id> <layout>p2</layout> <url>${egit-site}</url>
- </repository> -->
- </repositories>
- </profile>
- <profile>
- <id>osee.base.p2</id>
- <activation>
- <property>
- <name>osee.base.p2</name>
+ <name>ote.dependencies.p2</name>
</property>
</activation>
<repositories>
<repository>
- <id>osee.base.p2</id>
+ <id>ote.dependencies.p2</id>
<layout>p2</layout>
- <url>${osee.base.p2}</url>
+ <url>${ote.dependencies.p2}</url>
</repository>
</repositories>
</profile>
diff --git a/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml b/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml
index 00883fc..1e5a571 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml
@@ -50,13 +50,6 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>sparcv9</arch>
- </environment>
- <!--
- -->
</environments>
</configuration>
</plugin>
diff --git a/org.eclipse.ote.build/maven/base/pom.xml b/org.eclipse.ote.build/maven/base/pom.xml
index 320ccff..36511d1 100644
--- a/org.eclipse.ote.build/maven/base/pom.xml
+++ b/org.eclipse.ote.build/maven/base/pom.xml
@@ -282,8 +282,6 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
- <!--
- -->
</environments>
</configuration>
</plugin>
@@ -314,8 +312,6 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
- <!--
- -->
</environments>
</configuration>
</plugin>
diff --git a/org.eclipse.ote.ci.test_server.external.feature/feature.xml b/org.eclipse.ote.ci.test_server.external.feature/feature.xml
index b565823..ab307ef 100644
--- a/org.eclipse.ote.ci.test_server.external.feature/feature.xml
+++ b/org.eclipse.ote.ci.test_server.external.feature/feature.xml
@@ -194,13 +194,6 @@
unpack="false"/>
<plugin
- id="org.apache.ws.commons.schema"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.xerces"
download-size="0"
install-size="0"
@@ -299,13 +292,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jdt.annotation"
download-size="0"
install-size="0"
diff --git a/org.eclipse.ote.ci.test_server.product/org.eclipse.ote.ci.test_server.product b/org.eclipse.ote.ci.test_server.product/org.eclipse.ote.ci.test_server.product
index 9cb9253..dc71c4c 100644
--- a/org.eclipse.ote.ci.test_server.product/org.eclipse.ote.ci.test_server.product
+++ b/org.eclipse.ote.ci.test_server.product/org.eclipse.ote.ci.test_server.product
@@ -52,12 +52,6 @@
<plugin id="org.apache.aries.proxy"/>
<plugin id="org.apache.aries.util"/>
<plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.cxf.core"/>
- <plugin id="org.apache.cxf.core.config" fragment="true"/>
- <plugin id="org.apache.cxf.jaxrs.client"/>
- <plugin id="org.apache.cxf.jaxrs.frontend"/>
- <plugin id="org.apache.cxf.rs.security.oauth2"/>
- <plugin id="org.apache.cxf.transport.http"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
<plugin id="org.apache.felix.gogo.shell"/>
@@ -83,7 +77,6 @@
<plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.osee.framework.jdk.core"/>
<plugin id="org.eclipse.osee.jaxrs"/>
- <plugin id="org.eclipse.osee.jaxrs.client"/>
<plugin id="org.eclipse.osee.logback.config" fragment="true"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
diff --git a/org.eclipse.ote.simple.oteide.product.parent/oteide.sh b/org.eclipse.ote.simple.oteide.product.parent/build.sh
similarity index 100%
rename from org.eclipse.ote.simple.oteide.product.parent/oteide.sh
rename to org.eclipse.ote.simple.oteide.product.parent/build.sh
diff --git a/org.eclipse.ote.test.server.p2/package-server-runtime.xml b/org.eclipse.ote.test.server.p2/package-server-runtime.xml
index 8791989..a10af6e 100644
--- a/org.eclipse.ote.test.server.p2/package-server-runtime.xml
+++ b/org.eclipse.ote.test.server.p2/package-server-runtime.xml
@@ -177,12 +177,6 @@
<then>
<echo file="@{configPath}/config.ini" message="${jarFilename}@start" append="true" />
</then>
- <elseif>
- <equals arg1="${projectName}" arg2="org.apache.cxf.core.config" />
- <then>
- <echo file="@{configPath}/config.ini" message="${projectName}" append="true" />
- </then>
- </elseif>
<elseif>
<equals arg1="${projectName}" arg2="org.eclipse.osee.ote.io" />
