Update declarations for StatET 4.0 / RJ 3.0
diff --git a/core/_build/org.eclipse.statet.rj.core-feature/feature.xml b/core/_build/org.eclipse.statet.rj.core-feature/feature.xml
index ea0a61b..d34c5ce 100644
--- a/core/_build/org.eclipse.statet.rj.core-feature/feature.xml
+++ b/core/_build/org.eclipse.statet.rj.core-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.statet.rj.core"
- version="2.1.0.qualifier"
+ version="3.0.0.qualifier"
label="StatET RJ - Java Core"
provider-name="Eclipse.org"
license-feature="org.eclipse.license"
diff --git a/core/_build/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF b/core/_build/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF
index cf22859..4576035 100644
--- a/core/_build/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF
+++ b/core/_build/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Java Core
diff --git a/core/org.eclipse.statet.rj.client/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.client/META-INF/MANIFEST.MF
index 19dae44..685e3ee 100644
--- a/core/org.eclipse.statet.rj.client/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.client/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.client;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Client Implementation
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.server;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.services.core;bundle-version="[2.1.0,2.2.0)"
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.server;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.services.core;bundle-version="[3.0.0,3.1.0)"
Import-Package: org.osgi.framework;version="1.8.0",
org.eclipse.core.runtime
Export-Package: org.eclipse.statet.rj.rsetups;version="3.0.0",
diff --git a/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
index 911815d..4fe855b 100644
--- a/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
+++ b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
@@ -106,7 +106,7 @@
public static final String RJ_CLIENT_ID= "org.eclipse.statet.rj.client";
public static int[] version() {
- return new int[] { 2, 1, 0 };
+ return new int[] { 3, 0, 0 };
}
public static final int EXTRA_BEFORE= 1;
diff --git a/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF
index 20033d3..7a88193 100644
--- a/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.data
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Data
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.statet.rj.data,
- org.eclipse.statet.rj.data.impl
+Export-Package: org.eclipse.statet.rj.data;version="3.0.0",
+ org.eclipse.statet.rj.data.impl;version="3.0.0"
diff --git a/core/org.eclipse.statet.rj.server.remotetools/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.server.remotetools/META-INF/MANIFEST.MF
index fc1cbdc..520bf31 100644
--- a/core/org.eclipse.statet.rj.server.remotetools/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.server.remotetools/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server.remotetools
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Server - Remote Tools
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.server;bundle-version="[2.1.0,2.2.0)"
+Require-Bundle: org.eclipse.statet.rj.server;bundle-version="[3.0.0,3.1.0)"
diff --git a/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF
index aab93da..962a175 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server.rpkg
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Server - R Package
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.server;bundle-version="[2.1.0,2.2.0)"
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.server;bundle-version="[3.0.0,3.1.0)"
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION b/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION
index 588539a..05c857d 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION
@@ -1,6 +1,6 @@
Encoding: UTF-8
Package: rj
-Version: 2.1.0-11
+Version: 3.0.0-0
Title: RJ - R Package for high-level Java-R library RJ
Author: Stephan Wahlbrink and others
Maintainer: Eclipse StatET Project <statet-dev@eclipse.org>
diff --git a/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF
index 6ae2bcb..d341cbc 100644
--- a/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF
@@ -1,15 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Server - Core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)",
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)",
org.eclipse.swt;bundle-version="3.6.0";resolution:=optional,
com.cenqua.shaj;bundle-version="1.0.0";resolution:=optional
Import-Package: org.osgi.framework;resolution:=optional,
- org.eclipse.core.runtime;resolution:=optional
+ org.eclipse.core.runtime;resolution:=optional,
+ org.eclipse.statet.jcommons.collections;resolution:=optional
Export-Package: org.eclipse.statet.rj,
org.eclipse.statet.rj.server,
org.eclipse.statet.rj.server.dbg,
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
index 90fb9a5..5674c04 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
@@ -37,7 +37,7 @@
public static final String RJ_DATA_ID= "org.eclipse.statet.rj.data";
public static final String RJ_SERVER_ID= "org.eclipse.statet.rj.server";
- public static final int[] RJ_VERSION= new int[] { 2, 1, 0 };
+ public static final int[] RJ_VERSION= new int[] { 3, 0, 0 };
public static final RjsStatus MISSING_ANSWER_STATUS= new RjsStatus(RjsStatus.ERROR, 121, "Server error (missing answer).");
diff --git a/core/org.eclipse.statet.rj.services.core/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.services.core/META-INF/MANIFEST.MF
index b71336a..2c46e03 100644
--- a/core/org.eclipse.statet.rj.services.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.services.core/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.services.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - R Services API and Tools - Core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)";visibility:=reexport
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)";visibility:=reexport
Import-Package: org.osgi.framework;version="1.8.0",
org.eclipse.core.runtime
-Export-Package: org.eclipse.statet.rj.graphic.core;version="1.0.0",
- org.eclipse.statet.rj.graphic.core.util;version="1.0.0",
- org.eclipse.statet.rj.renv.core;version="2.1.0",
- org.eclipse.statet.rj.services;version="1.0.0",
- org.eclipse.statet.rj.services.util;version="2.1.0",
- org.eclipse.statet.rj.services.util.dataaccess;version="2.1.0"
+Export-Package: org.eclipse.statet.rj.graphic.core;version="3.0.0",
+ org.eclipse.statet.rj.graphic.core.util;version="3.0.0",
+ org.eclipse.statet.rj.renv.core;version="3.0.0",
+ org.eclipse.statet.rj.services;version="3.0.0",
+ org.eclipse.statet.rj.services.util;version="3.0.0",
+ org.eclipse.statet.rj.services.util.dataaccess;version="3.0.0"
diff --git a/eclient/_build/org.eclipse.statet.rj.eclient-feature/feature.xml b/eclient/_build/org.eclipse.statet.rj.eclient-feature/feature.xml
index b86de8c..b65dfee 100644
--- a/eclient/_build/org.eclipse.statet.rj.eclient-feature/feature.xml
+++ b/eclient/_build/org.eclipse.statet.rj.eclient-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.statet.rj.eclient"
- version="2.1.0.qualifier"
+ version="3.0.0.qualifier"
label="StatET RJ - Eclipse Client"
provider-name="Eclipse.org"
license-feature="org.eclipse.license"
@@ -20,8 +20,8 @@
</license>
<requires>
- <import feature="org.eclipse.statet.rj.core" version="2.1.0" match="equivalent"/>
- <import feature="org.eclipse.statet.ecommons.e" version="1.2.0" match="compatible"/>
+ <import feature="org.eclipse.statet.rj.core" version="3.0.0" match="equivalent"/>
+ <import feature="org.eclipse.statet.ecommons.e" version="4.0.0" match="compatible"/>
</requires>
<plugin
diff --git a/eclient/org.eclipse.statet.rj.eclient.core/META-INF/MANIFEST.MF b/eclient/org.eclipse.statet.rj.eclient.core/META-INF/MANIFEST.MF
index 0a9d294..4b4e235 100644
--- a/eclient/org.eclipse.statet.rj.eclient.core/META-INF/MANIFEST.MF
+++ b/eclient/org.eclipse.statet.rj.eclient.core/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.eclient.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Eclipse Client - Core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)";visibility:=reexport,
- org.eclipse.statet.rj.services.core;bundle-version="[2.1.0,2.2.0)";visibility:=reexport
-Export-Package: org.eclipse.statet.rj.eclient.core;version="1.2.0"
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0";visibility:=reexport,
+ org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)";visibility:=reexport,
+ org.eclipse.statet.rj.services.core;bundle-version="[3.0.0,3.1.0)";visibility:=reexport
+Export-Package: org.eclipse.statet.rj.eclient.core;version="3.0.0"
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/META-INF/MANIFEST.MF b/eclient/org.eclipse.statet.rj.eclient.graphics/META-INF/MANIFEST.MF
index b8a3c0e..1c111b4 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/META-INF/MANIFEST.MF
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.eclient.graphics;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - Eclipse Client - R Graphics
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.statet.internal.rj.eclient.graphics.RGraphicsPlugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.statet.rj.services.core;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.client;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.eclient.core;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.statet.rj.services.core;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.client;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.eclient.core;bundle-version="[3.0.0,3.1.0)",
org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.statet.ecommons.uimisc;bundle-version="[1.6.0,1.7.0)"
-Import-Package: org.eclipse.statet.ecommons.collections;version="1.6.0",
+ org.eclipse.statet.ecommons.uimisc;bundle-version="[4.0.0,4.1.0)"
+Import-Package: org.eclipse.statet.ecommons.collections;version="4.0.0",
org.eclipse.statet.ecommons.databinding,
- org.eclipse.statet.jcommons.collections;version="1.0.0",
- org.eclipse.statet.jcommons.lang;version="1.0.0"
+ org.eclipse.statet.jcommons.collections;version="4.0.0",
+ org.eclipse.statet.jcommons.lang;version="4.0.0"
Export-Package: org.eclipse.statet.rj.eclient.graphics,
org.eclipse.statet.rj.eclient.graphics.comclient,
org.eclipse.statet.rj.eclient.graphics.util
diff --git a/examples/org.eclipse.statet.rj.servi.demo/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.servi.demo/META-INF/MANIFEST.MF
index 00e705a..c7d05dd 100644
--- a/examples/org.eclipse.statet.rj.servi.demo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.servi.demo/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi.demo
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - RServi Demo
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="1.1.0",
- org.eclipse.statet.rj.servi;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="3.0.0",
+ org.eclipse.statet.rj.servi;bundle-version="3.0.0",
org.eclipse.swt;bundle-version="3.4.0",
org.eclipse.statet.ecommons.runtime.core
Import-Package: org.eclipse.core.runtime,
- org.eclipse.statet.jcommons.lang;version="1.0.0",
+ org.eclipse.statet.jcommons.lang;version="4.0.0",
org.eclipse.statet.rj.services,
org.eclipse.statet.rj.services.util
diff --git a/examples/org.eclipse.statet.rj.servi.rcpdemo/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.servi.rcpdemo/META-INF/MANIFEST.MF
index 13cfc64..6e6f484 100644
--- a/examples/org.eclipse.statet.rj.servi.rcpdemo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.servi.rcpdemo/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi.rcpdemo;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - RServi RCP Demo (1)
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.statet.internal.rj.servi.rcpdemo.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.statet.ecommons.rmi.core;bundle-version="1.5.0",
- org.eclipse.statet.rj.data;bundle-version="2.1.0",
- org.eclipse.statet.rj.server;bundle-version="2.1.0",
- org.eclipse.statet.rj.client;bundle-version="2.1.0",
- org.eclipse.statet.rj.servi;bundle-version="2.1.0",
+ org.eclipse.statet.ecommons.rmi.core;bundle-version="4.0.0",
+ org.eclipse.statet.rj.data;bundle-version="3.0.0",
+ org.eclipse.statet.rj.server;bundle-version="3.0.0",
+ org.eclipse.statet.rj.client;bundle-version="3.0.0",
+ org.eclipse.statet.rj.servi;bundle-version="3.0.0",
org.eclipse.ui,
- org.eclipse.statet.rj.eclient.graphics;bundle-version="2.1.0"
+ org.eclipse.statet.rj.eclient.graphics;bundle-version="3.0.0"
diff --git a/examples/org.eclipse.statet.rj.servi.rcpdemo2/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.servi.rcpdemo2/META-INF/MANIFEST.MF
index 62dcbf1..029bb28 100644
--- a/examples/org.eclipse.statet.rj.servi.rcpdemo2/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.servi.rcpdemo2/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi.rcpdemo2;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - RServi RCP Demo (2)
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.statet.internal.rj.servi.rcpdemo.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="1.1.0";visibility:=reexport,
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0";visibility:=reexport,
org.eclipse.core.runtime,
- org.eclipse.statet.ecommons.rmi.core;bundle-version="1.5.0",
- org.eclipse.statet.rj.data;bundle-version="2.1.0",
- org.eclipse.statet.rj.server;bundle-version="2.1.0",
- org.eclipse.statet.rj.client;bundle-version="2.1.0",
- org.eclipse.statet.rj.servi;bundle-version="2.1.0",
+ org.eclipse.statet.ecommons.rmi.core;bundle-version="4.0.0",
+ org.eclipse.statet.rj.data;bundle-version="3.0.0",
+ org.eclipse.statet.rj.server;bundle-version="3.0.0",
+ org.eclipse.statet.rj.client;bundle-version="3.0.0",
+ org.eclipse.statet.rj.servi;bundle-version="3.0.0",
org.eclipse.ui,
- org.eclipse.statet.rj.eclient.core;bundle-version="2.1.0",
- org.eclipse.statet.rj.eclient.graphics;bundle-version="2.1.0"
-Import-Package: org.eclipse.statet.jcommons.lang;version="1.0.0"
+ org.eclipse.statet.rj.eclient.core;bundle-version="3.0.0",
+ org.eclipse.statet.rj.eclient.graphics;bundle-version="3.0.0"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0"
diff --git a/servi/_build/org.eclipse.statet.rj.servi.e-feature/feature.xml b/servi/_build/org.eclipse.statet.rj.servi.e-feature/feature.xml
index b2f08c1..6e7f824 100644
--- a/servi/_build/org.eclipse.statet.rj.servi.e-feature/feature.xml
+++ b/servi/_build/org.eclipse.statet.rj.servi.e-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.statet.rj.servi.e"
- version="2.1.0.qualifier"
+ version="3.0.0.qualifier"
label="StatET RJ - RServi E-Compilation"
provider-name="Eclipse.org"
license-feature="org.eclipse.license"
diff --git a/servi/org.eclipse.statet.rj.servi.webapp/pom.xml b/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
index e981f77..8fbc60b 100644
--- a/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
+++ b/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj-servi</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../_build</relativePath>
</parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>org.eclipse.statet.rj.servi.webapp</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<dependencies>
@@ -21,28 +21,23 @@
<dependency>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>org.eclipse.statet.rj.servi</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>org.eclipse.statet.rj.client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.statet.rj</groupId>
- <artifactId>org.eclipse.statet.rj.services.eruntime</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<!-- RJ Core -->
<dependency>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>org.eclipse.statet.rj.data</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>org.eclipse.statet.rj.server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<!-- JSF -->
<dependency>
diff --git a/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF b/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF
index 1cb545f..246ab93 100644
--- a/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF
+++ b/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Name: StatET RJ - RServi
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="1.1.0",
- org.eclipse.statet.ecommons.rmi.core;bundle-version="1.4.0",
- org.eclipse.statet.rj.data;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.server;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.statet.rj.services.core;bundle-version="[2.1.0,2.2.0)";visibility:=reexport,
- org.eclipse.statet.rj.client;bundle-version="[2.1.0,2.2.0)",
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0",
+ org.eclipse.statet.ecommons.rmi.core;bundle-version="4.0.0",
+ org.eclipse.statet.rj.data;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.server;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.statet.rj.services.core;bundle-version="[3.0.0,3.1.0)";visibility:=reexport,
+ org.eclipse.statet.rj.client;bundle-version="[3.0.0,3.1.0)",
org.apache.commons.pool
-Import-Package: org.eclipse.statet.jcommons.collections;version="1.0.0",
- org.eclipse.statet.jcommons.lang;version="1.0.0"
+Import-Package: org.eclipse.statet.jcommons.collections;version="4.0.0",
+ org.eclipse.statet.jcommons.lang;version="4.0.0"
Export-Package: org.eclipse.statet.internal.rj.servi;x-friends:="org.eclipse.statet.rj.tests",
- org.eclipse.statet.rj.servi;version="1.2.0",
+ org.eclipse.statet.rj.servi;version="3.0.0",
org.eclipse.statet.rj.servi.node,
org.eclipse.statet.rj.servi.pool
