feature: Updating OTE build for latest OSEE changes
This includes adding specific versions of dependency jars and upgrading
tycho version to 1.7.
Change-Id: I0489964b325b6705b48b64755a151537106c638a
diff --git a/org.eclipse.osee.client.ote.feature/feature.xml b/org.eclipse.osee.client.ote.feature/feature.xml
index 8c95482..cd58a81 100644
--- a/org.eclipse.osee.client.ote.feature/feature.xml
+++ b/org.eclipse.osee.client.ote.feature/feature.xml
@@ -44,13 +44,6 @@
<import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.lang"/>
<import plugin="org.eclipse.core.net"/>
- <import plugin="org.apache.cxf.core"/>
- <import plugin="org.apache.cxf.jaxrs.client"/>
- <import plugin="org.apache.cxf.jaxrs.frontend"/>
- <import plugin="org.apache.cxf.jaxrs.model.wadl"/>
- <import plugin="org.apache.cxf.jaxrs.provider"/>
- <import plugin="org.apache.cxf.rs.security.oauth2"/>
- <import plugin="org.apache.cxf.transport.http"/>
<import plugin="org.apache.aries.blueprint"/>
<import plugin="org.apache.aries.blueprint.annotation"/>
<import plugin="org.apache.aries.proxy"/>
@@ -70,7 +63,6 @@
<import feature="org.eclipse.osee.core.feature"/>
<import feature="org.eclipse.osee.core.runtime.feature"/>
<import feature="org.eclipse.osee.core.ui.feature"/>
- <import feature="org.eclipse.osee.dep.feature"/>
<import feature="org.eclipse.osee.framework.ui.feature"/>
</requires>
diff --git a/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF b/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF
index 8fd3b63..4822bb5 100644
--- a/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF
+++ b/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF
@@ -6,46 +6,7 @@
Bundle-Activator: org.eclipse.osee.ote.service.Activator
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-ActivationPolicy: lazy
-Import-Package: net.jini.activation,
- net.jini.admin,
- net.jini.config,
- net.jini.constraint,
- net.jini.core.constraint,
- net.jini.core.discovery,
- net.jini.core.entry,
- net.jini.core.event,
- net.jini.core.lease,
- net.jini.core.lookup,
- net.jini.core.transaction,
- net.jini.core.transaction.server,
- net.jini.discovery,
- net.jini.entry,
- net.jini.event,
- net.jini.export,
- net.jini.id,
- net.jini.iiop,
- net.jini.io,
- net.jini.io.context,
- net.jini.jeri,
- net.jini.jeri.connection,
- net.jini.jeri.http,
- net.jini.jeri.kerberos,
- net.jini.jeri.ssl,
- net.jini.jeri.tcp,
- net.jini.jrmp,
- net.jini.lease,
- net.jini.loader,
- net.jini.loader.pref,
- net.jini.lookup,
- net.jini.lookup.entry,
- net.jini.security,
- net.jini.security.policy,
- net.jini.security.proxytrust,
- net.jini.space,
- net.jini.url.file,
- net.jini.url.httpmd,
- net.jini.url.https,
- org.eclipse.core.runtime,
+Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.connection.service,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.jdk.core.type,
diff --git a/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java b/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java
deleted file mode 100644
index e11c958..0000000
--- a/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2010 Boeing
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Boeing - initial API and implementation
- **********************************************************************/
-
-package org.eclipse.osee.ote.service;
-
-import java.io.File;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.server.ExportException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.connection.service.IServiceConnector;
-import org.eclipse.osee.connection.service.IServicePropertyChangeListener;
-import org.eclipse.osee.framework.jdk.core.util.EnhancedProperties;
-import org.eclipse.osee.framework.plugin.core.util.ExportClassLoader;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
-import org.eclipse.osee.ote.properties.OteProperties;
-import net.jini.export.Exporter;
-import net.jini.jeri.BasicILFactory;
-import net.jini.jeri.BasicJeriExporter;
-import net.jini.jeri.tcp.TcpServerEndpoint;
-
-/**
- * @author Andrew M. Finkbeiner
- */
-public class JmsToJiniBridgeConnector implements IServiceConnector {
- public static final String TYPE = "jmstojini";
- private static final class ExportInfo {
- private final Exporter exporter;
- private final Object exportedObject;
-
- private ExportInfo(Exporter exporter, Object exportedObject) {
- this.exportedObject = exportedObject;
- this.exporter = exporter;
- }
- }
-
- private EnhancedProperties properties;
- private final HashMap<Object, ExportInfo> exports = new HashMap<>();
- private final ExportClassLoader exportClassLoader;
- private final Object service;
- private final List<IServicePropertyChangeListener> propertyChangeListeners =
- new CopyOnWriteArrayList<IServicePropertyChangeListener>();
- private final String uniqueServerId;
- private boolean connected = false;
-
- public JmsToJiniBridgeConnector(ExportClassLoader exportClassLoader, Object service, String id) {
- this.uniqueServerId = id;
- this.exportClassLoader = exportClassLoader;
- this.service = service;
- if (service instanceof IHostTestEnvironment) {
- try {
- this.properties = ((IHostTestEnvironment) service).getProperties();
- } catch (RemoteException ex) {
- this.properties = new EnhancedProperties();
- ex.printStackTrace();
- }
- } else {
- this.properties = new EnhancedProperties();
- }
- }
-
- @Override
- public Object export(Object callback) throws ExportException {
- try {
- Exporter exporter = createExporter();
- Object exportedObject = exporter.export((Remote) callback);
- exports.put(callback, new ExportInfo(exporter, exportedObject));
- return exportedObject;
- } catch (UnknownHostException e) {
- throw new ExportException("failed to export", e);
- }
- }
-
- @Override
- public void unexport(Object callback) throws Exception {
- ExportInfo info = exports.remove(callback);
- if (info != null) {
- info.exporter.unexport(false);
- }
- }
-
- @Override
- public Object findExport(Object callback) {
- ExportInfo info = exports.get(callback);
- if (info != null) {
- return info.exportedObject;
- }
- return null;
- }
-
- @Override
- public void stop() throws Exception {
- for (ExportInfo info : exports.values()) {
- info.exporter.unexport(false);
- }
- exports.clear();
- }
-
- private Exporter createExporter() throws UnknownHostException {
- return new BasicJeriExporter(TcpServerEndpoint.getInstance(OteProperties.getDefaultIpAddress(), 0),
- new BasicILFactory(null, null, exportClassLoader), false, false);
- }
-
- @Override
- public String getConnectorType() {
- return TYPE;
- }
-
- @Override
- public Serializable getProperty(String property, Serializable defaultValue) {
- return properties.getProperty(property, defaultValue);
- }
-
- @Override
- public Object getService() {
- return service;
- }
-
- @Override
- public boolean ping() {
- if (getService() != null && getService() instanceof IHostTestEnvironment) {
- try {
- ((IHostTestEnvironment) getService()).getProperties();
- return true;
- } catch (Throwable th) {
- return false;
- }
- }
- return false;
- }
-
- @Override
- public void addPropertyChangeListener(IServicePropertyChangeListener listener) {
- propertyChangeListeners.add(listener);
- }
-
- @Override
- public void removePropertyChangeListener(IServicePropertyChangeListener listener) {
- propertyChangeListeners.remove(listener);
- }
-
- @Override
- public void setProperty(String key, Serializable value) {
- properties.setProperty(key, value);
- for (IServicePropertyChangeListener listener : propertyChangeListeners) {
- listener.propertyChanged(this, key, value);
- }
- }
-
- @Override
- public URI upload(File file) throws Exception {
- return null;
- }
-
- @Override
- public String getUniqueServerId() {
- return uniqueServerId;
- }
-
- @Override
- public EnhancedProperties getProperties() {
- return properties;
- }
-
- @Override
- public void init(Object service) throws UnknownHostException, ExportException {
-
- }
-
- public void setConnected(boolean connected) {
- this.connected = connected;
- }
-
- public boolean isConnected() {
- return this.connected;
- }
-
-}
diff --git a/org.eclipse.osee.ote.master.product/customize-product.xml b/org.eclipse.osee.ote.master.product/customize-product.xml
index 8bb69b7..2ebba86 100644
--- a/org.eclipse.osee.ote.master.product/customize-product.xml
+++ b/org.eclipse.osee.ote.master.product/customize-product.xml
@@ -15,9 +15,7 @@
<property name="defaultWorkspaceName" value="workspace" />
<property name="additionalExecIniArgs" value=" " />
- <updateProduct os="win32" ws="win32" arch="x86" jreVersion="1.8.0_45" />
<updateProduct os="win32" ws="win32" arch="x86_64" jreVersion="1.8.0_45" />
- <updateProduct os="linux" ws="gtk" arch="x86" 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="_" />
diff --git a/org.eclipse.osee.ote.parent/pom.xml b/org.eclipse.osee.ote.parent/pom.xml
index 5dfab9a..6e6a978 100644
--- a/org.eclipse.osee.ote.parent/pom.xml
+++ b/org.eclipse.osee.ote.parent/pom.xml
@@ -55,8 +55,8 @@
<git-repo-root>file:../..</git-repo-root>
<build-alias>-DEV</build-alias>
- <tycho-version>1.0.0</tycho-version>
- <tycho-extras-version>1.0.0</tycho-extras-version>
+ <tycho-version>1.7.0</tycho-version>
+ <tycho-extras-version>1.7.0</tycho-extras-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
@@ -142,16 +142,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
@@ -180,16 +170,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
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 2c93fe8..37077a2 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.feature/feature.xml
@@ -425,6 +425,14 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.ecf.filetransfer.httpclient45.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.ecf.filetransfer.httpclient45.feature.source"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.ecf.filetransfer.ssl.feature"
version="0.0.0"/>
@@ -454,6 +462,8 @@
<requires>
<import plugin="org.junit" version="4.12.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.batik.gvt" version="1.9.1" match="compatible"/>
+ <import plugin="org.apache.batik.gvt" version="1.13.0" match="compatible"/>
</requires>
<plugin
@@ -829,6 +839,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.nebula.cwt"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.osgi"
download-size="0"
install-size="0"
@@ -983,6 +1000,62 @@
unpack="false"/>
<plugin
+ id="org.apache.batik.anim"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201130-1756"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.anim"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20181015-1528"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.awt.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.bridge"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20181015-1528"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.bridge"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201124-1840"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.codec"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.constants"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20180227-1645"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.constants"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20200622-2037"
+ unpack="false"/>
+
+ <plugin
id="org.apache.batik.css"
download-size="0"
install-size="0"
@@ -990,6 +1063,125 @@
unpack="false"/>
<plugin
+ id="org.apache.batik.dom"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20181015-1528"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.dom"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201124-1839"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.dom.svg"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.ext.awt"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.extension"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.gvt"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201124-1835"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.gvt"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20190730-1743"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.i18n"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20200622-2037"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.i18n"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20180227-1645"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.parser"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20190730-1743"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.parser"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201124-1833"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.pdf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.script"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.svggen"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.transcoder"
+ download-size="0"
+ install-size="0"
+ version="1.13.0.v20201124-1841"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.transcoder"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20181015-1528"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.util"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20180703-1553"
+ unpack="false"/>
+
+ <plugin
id="org.apache.batik.util.gui"
download-size="0"
install-size="0"
@@ -997,10 +1189,17 @@
unpack="false"/>
<plugin
- id="org.apache.batik.util"
+ id="org.apache.batik.xml"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.13.0.v20201124-1831"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.xml"
+ download-size="0"
+ install-size="0"
+ version="1.9.1.v20190730-1743"
unpack="false"/>
<plugin
@@ -1074,6 +1273,13 @@
unpack="false"/>
<plugin
+ id="org.apache.xalan"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.apache.xerces"
download-size="0"
install-size="0"
@@ -1508,69 +1714,6 @@
unpack="false"/>
<plugin
- id="org.apache.batik.ext.awt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.transcoder"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.bridge"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.dom"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.dom.svg"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.svggen"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.parser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.xml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.pdf"
- 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"
@@ -1828,5 +1971,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.j2ee"
+ download-size="0"
+ install-size="0"
+ version="1.2.301.v201903222025"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.j2ee.core"
+ download-size="0"
+ install-size="0"
+ version="1.4.1.v201903222024"
+ unpack="false"/>
</feature>
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 a8b6481..00883fc 100644
--- a/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml
+++ b/org.eclipse.ote.build/dependencies/ote.dependencies.p2/pom.xml
@@ -43,21 +43,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
diff --git a/org.eclipse.ote.build/maven/base/pom.xml b/org.eclipse.ote.build/maven/base/pom.xml
index 0532e77..84b2abc 100644
--- a/org.eclipse.ote.build/maven/base/pom.xml
+++ b/org.eclipse.ote.build/maven/base/pom.xml
@@ -275,21 +275,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!--
@@ -317,21 +307,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!--
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 97017e5..b565823 100644
--- a/org.eclipse.ote.ci.test_server.external.feature/feature.xml
+++ b/org.eclipse.ote.ci.test_server.external.feature/feature.xml
@@ -173,63 +173,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.core.config"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- 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.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.felix.gogo.runtime"
download-size="0"
install-size="0"
diff --git a/org.eclipse.ote.client.feature/feature.xml b/org.eclipse.ote.client.feature/feature.xml
index 2dd3f8c..44b6b48 100644
--- a/org.eclipse.ote.client.feature/feature.xml
+++ b/org.eclipse.ote.client.feature/feature.xml
@@ -15,9 +15,7 @@
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
- <includes
- id="org.eclipse.xtext.ui"
- version="0.0.0"/>
+
<plugin
id="org.eclipse.ote.client"
download-size="0"
@@ -100,21 +98,20 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.zest.layouts"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
-
+ unpack="false"/>
+
<plugin
id="org.mockito"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
</feature>
diff --git a/org.eclipse.ote.mavenbuild/pom.xml b/org.eclipse.ote.mavenbuild/pom.xml
index b004fff..edac69e 100644
--- a/org.eclipse.ote.mavenbuild/pom.xml
+++ b/org.eclipse.ote.mavenbuild/pom.xml
@@ -289,21 +289,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!--
@@ -322,21 +312,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!--
diff --git a/org.eclipse.ote.parent/buildLocal.sh b/org.eclipse.ote.parent/buildLocal.sh
new file mode 100644
index 0000000..2f059a4
--- /dev/null
+++ b/org.eclipse.ote.parent/buildLocal.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export BASE_AREA=`pwd | sed 's/\/c\//\/c\:\//'`
+echo "mvn clean verify -Dote.dependencies.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/ -Dosee.ote.p2=file://$BASE_AREA/../org.eclipse.osee.ote.p2/target/repository -Dosee-build-stage=nothing -Dno-extern-repos"
+mvn clean verify -Dote.dependencies.p2=file://$BASE_AREA/../org.eclipse.ote.build/dependencies/ote.dependencies.p2/target/repository/ -Dosee.ote.p2=file://$BASE_AREA/../org.eclipse.osee.ote.p2/target/repository -Dosee-build-stage=nothing -Dno-extern-repos
\ No newline at end of file
diff --git a/org.eclipse.ote.parent/pom.xml b/org.eclipse.ote.parent/pom.xml
index 73f524b..6b943b5 100644
--- a/org.eclipse.ote.parent/pom.xml
+++ b/org.eclipse.ote.parent/pom.xml
@@ -58,8 +58,8 @@
<build-alias>-DEV</build-alias>
- <tycho-version>1.0.0</tycho-version>
- <tycho-extras-version>1.0.0</tycho-extras-version>
+ <tycho-version>1.7.0</tycho-version>
+ <tycho-extras-version>1.7.0</tycho-extras-version>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
@@ -89,13 +89,11 @@
<platform-version-name>neon</platform-version-name>
<!-- <orbit-version>R20150124073747</orbit-version> -->
<orbit-version>R20160520211859</orbit-version>
- <xtext-version>2.0.0</xtext-version>
<subversive-version>1.0</subversive-version>
<polarion-version>3.0</polarion-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>
- <itemis-site>http://download.itemis.com/updates/releases/${xtext-version}</itemis-site>
<osee-create-help-docs>false</osee-create-help-docs>
@@ -145,16 +143,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
@@ -183,16 +171,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
@@ -231,7 +209,6 @@
<excludes>
<plugin id="sourcefeature.bundle.nosource" />
<feature id="sourcefeature.feature.nosource" />
- <feature id="org.eclipse.xtext.ui" />
<plugin id="org.eclipse.zest.core" />
<plugin id="org.eclipse.zest.layouts" />
diff --git a/org.eclipse.ote.simple.oteide.product/iniWorkaround.xml b/org.eclipse.ote.simple.oteide.product/iniWorkaround.xml
index 6d57faf..d16258c 100644
--- a/org.eclipse.ote.simple.oteide.product/iniWorkaround.xml
+++ b/org.eclipse.ote.simple.oteide.product/iniWorkaround.xml
@@ -3,9 +3,7 @@
<target name="iniWorkaround">
<property name="linux_x86_64" value="target/products/ote.ide/linux/gtk/x86_64" />
- <property name="linux_x86" value="target/products/ote.ide/linux/gtk/x86" />
<property name="win_x86_64" value="target/products/ote.ide/win32/win32/x86_64" />
- <property name="win_x86" value="target/products/ote.ide/win32/win32/x86" />
<!-- write out some version files -->
<tstamp>
@@ -13,9 +11,7 @@
</tstamp>
<echo file="${basedir}/target/build_date.txt" append="false" message="${TODAY}" />
<copy verbose="true" file="${basedir}/target/build_date.txt" todir="${linux_x86_64}" overwrite="true" />
- <copy verbose="true" file="${basedir}/target/build_date.txt" todir="${linux_x86}" overwrite="true" />
<copy verbose="true" file="${basedir}/target/build_date.txt" todir="${win_x86_64}" overwrite="true" />
- <copy verbose="true" file="${basedir}/target/build_date.txt" todir="${win_x86}" overwrite="true" />
<!-- do the post install -->
diff --git a/org.eclipse.ote.simple.oteide.product/ote.ide.product b/org.eclipse.ote.simple.oteide.product/ote.ide.product
index 47ebea0..1cc2bbd 100644
--- a/org.eclipse.ote.simple.oteide.product/ote.ide.product
+++ b/org.eclipse.ote.simple.oteide.product/ote.ide.product
@@ -47,18 +47,6 @@
</plugins>
<features>
- <feature id="org.eclipse.cdt"/>
- <feature id="org.eclipse.cdt.gdb"/>
- <feature id="org.eclipse.cdt.gdb.source"/>
- <feature id="org.eclipse.cdt.gnu.build"/>
- <feature id="org.eclipse.cdt.gnu.build.source"/>
- <feature id="org.eclipse.cdt.gnu.debug"/>
- <feature id="org.eclipse.cdt.gnu.debug.source"/>
- <feature id="org.eclipse.cdt.gnu.dsf"/>
- <feature id="org.eclipse.cdt.gnu.dsf.source"/>
- <feature id="org.eclipse.cdt.platform"/>
- <feature id="org.eclipse.cdt.platform.source"/>
- <feature id="org.eclipse.cdt.sdk"/>
<feature id="org.eclipse.e4.rcp"/>
<feature id="org.eclipse.e4.rcp.source"/>
<feature id="org.eclipse.eclemma.feature"/>
@@ -67,12 +55,6 @@
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.jgit"/>
<feature id="org.eclipse.m2e.feature"/>
- <feature id="org.eclipse.mylyn.commons"/>
- <feature id="org.eclipse.mylyn.commons.identity"/>
- <feature id="org.eclipse.mylyn.commons.notifications"/>
- <feature id="org.eclipse.mylyn.commons.repositories"/>
- <feature id="org.eclipse.mylyn.discovery"/>
- <feature id="org.eclipse.mylyn.monitor"/>
<feature id="org.eclipse.nebula.widgets.xviewer.feature"/>
<feature id="org.eclipse.osee.client.ote.feature"/>
<feature id="org.eclipse.osee.client.ote.feature.source"/>
diff --git a/org.eclipse.ote.simple.oteide.product/pom.xml b/org.eclipse.ote.simple.oteide.product/pom.xml
index 76fa38e..fbf7c64 100644
--- a/org.eclipse.ote.simple.oteide.product/pom.xml
+++ b/org.eclipse.ote.simple.oteide.product/pom.xml
@@ -25,11 +25,6 @@
<format>'v'yyyyMMddHHmm'${build-alias}'</format>
<archiveSite>true</archiveSite>
<environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
<environment>
<os>win32</os>
<ws>win32</ws>
@@ -38,11 +33,6 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
</environments>
@@ -59,21 +49,11 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
</environments>
diff --git a/org.eclipse.ote.test.server.external.feature/feature.xml b/org.eclipse.ote.test.server.external.feature/feature.xml
index c8c3def..83e77f3 100644
--- a/org.eclipse.ote.test.server.external.feature/feature.xml
+++ b/org.eclipse.ote.test.server.external.feature/feature.xml
@@ -100,13 +100,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.equinox.preferences"
download-size="0"
install-size="0"
@@ -403,62 +396,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.ws.commons.schema"
- 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.jaxrs.frontend"
- download-size="0"
- install-size="0"
- version="0.0.0"
- 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.transport.http"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.codehaus.stax2"
download-size="0"
install-size="0"
@@ -521,11 +458,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/org.eclipse.ote.test.server.external.feature/pom.xml b/org.eclipse.ote.test.server.external.feature/pom.xml
index c35fa8c..fa36442 100644
--- a/org.eclipse.ote.test.server.external.feature/pom.xml
+++ b/org.eclipse.ote.test.server.external.feature/pom.xml
@@ -29,20 +29,26 @@
<configuration>
<excludes>
<plugin id="ch.qos.logback.slf4j" />
+ <plugin id="ch.qos.logback.core" />
+ <plugin id="ch.qos.logback.classic" />
<plugin id="com.google.guava" />
+ <plugin id="javax.activation" />
+ <plugin id="javax.annotation" />
<plugin id="javax.servlet" />
<plugin id="javax.ws.rs" />
<plugin id="javax.xml" />
<plugin id="jms.libraries" />
<plugin id="net.jini" />
+ <plugin id="org.apache.aries.proxy" />
+ <plugin id="org.apache.aries.util" />
<plugin id="org.apache.commons.codec" />
- <plugin id="org.apache.cxf.core.config" />
<plugin id="org.apache.xerces" />
<plugin id="org.apache.xml.resolver" />
<plugin id="org.apache.xml.serializer" />
<plugin id="org.eclipse.equinox.console.ssh" />
<plugin id="org.eclipse.jgit" />
<plugin id="org.eclipse.osee.logback.config" />
+ <plugin id="org.eclipse.osgi.services" />
</excludes>
</configuration>
</execution>
diff --git a/org.eclipse.ote.test.server.feature/feature.xml b/org.eclipse.ote.test.server.feature/feature.xml
index 1d8e539..f8a2a31 100644
--- a/org.eclipse.ote.test.server.feature/feature.xml
+++ b/org.eclipse.ote.test.server.feature/feature.xml
@@ -95,20 +95,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.jaxrs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.jaxrs.client"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.ote.connection.jini"
download-size="0"
install-size="0"
diff --git a/org.eclipse.ote.test.server.parent/pom.xml b/org.eclipse.ote.test.server.parent/pom.xml
index 0442352..ec22c6b 100644
--- a/org.eclipse.ote.test.server.parent/pom.xml
+++ b/org.eclipse.ote.test.server.parent/pom.xml
@@ -54,13 +54,11 @@
<platform-version-name>neon</platform-version-name>
<orbit-version>R20160520211859</orbit-version>
- <xtext-version>2.0.0</xtext-version>
<subversive-version>1.0</subversive-version>
<polarion-version>3.0</polarion-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>
- <itemis-site>http://download.itemis.com/updates/releases/${xtext-version}</itemis-site>
<osee-create-help-docs>true</osee-create-help-docs>
@@ -109,16 +107,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
@@ -147,16 +135,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
