Bumb version to 4.1.0-dev
diff --git a/core/_assemblies/org.eclipse.statet.rj.core-feature/feature.xml b/core/_assemblies/org.eclipse.statet.rj.core-feature/feature.xml
index dd15544..b130951 100644
--- a/core/_assemblies/org.eclipse.statet.rj.core-feature/feature.xml
+++ b/core/_assemblies/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="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse StatET"
label="StatET RJ - Core (Incubation)"
license-feature="org.eclipse.license"
diff --git a/core/_assemblies/org.eclipse.statet.rj.server-consoleserver/pom.xml b/core/_assemblies/org.eclipse.statet.rj.server-consoleserver/pom.xml
index affeef7..84f2cf0 100644
--- a/core/_assemblies/org.eclipse.statet.rj.server-consoleserver/pom.xml
+++ b/core/_assemblies/org.eclipse.statet.rj.server-consoleserver/pom.xml
@@ -7,11 +7,11 @@
<parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.server-consoleserver</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
diff --git a/core/_assemblies/pom.xml b/core/_assemblies/pom.xml
index e67e64d..0725026 100644
--- a/core/_assemblies/pom.xml
+++ b/core/_assemblies/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
diff --git a/core/org.eclipse.statet.rj.client/.classpath b/core/org.eclipse.statet.rj.client/.classpath
index 7728a88..78c94b4 100644
--- a/core/org.eclipse.statet.rj.client/.classpath
+++ b/core/org.eclipse.statet.rj.client/.classpath
@@ -11,5 +11,5 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
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 3baae9f..6ada302 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: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Client Implementation (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.server;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.services.core;bundle-version="[4.0.0,4.1.0)"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0"
-Export-Package: org.eclipse.statet.rj.server.client;version="4.0.0"
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.services.core;bundle-version="[4.1.0,4.2.0)"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0"
+Export-Package: org.eclipse.statet.rj.server.client;version="4.1.0"
diff --git a/core/org.eclipse.statet.rj.client/build.properties b/core/org.eclipse.statet.rj.client/build.properties
index 9f02c9f..239dd55 100644
--- a/core/org.eclipse.statet.rj.client/build.properties
+++ b/core/org.eclipse.statet.rj.client/build.properties
@@ -1,5 +1,5 @@
source..= src/
-output..= bin/
+output..= target/classes/
javacDefaultEncoding..= UTF-8
bin.includes= META-INF/,\
diff --git a/core/org.eclipse.statet.rj.client/pom.xml b/core/org.eclipse.statet.rj.client/pom.xml
index 36dde74..13ad28e 100644
--- a/core/org.eclipse.statet.rj.client/pom.xml
+++ b/core/org.eclipse.statet.rj.client/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.client</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/core/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF
index c0678b7..bfc58c8 100644
--- a/core/org.eclipse.statet.rj.core/META-INF/MANIFEST.MF
+++ b/core/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: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Java Core (Incubation)
diff --git a/core/org.eclipse.statet.rj.data/.classpath b/core/org.eclipse.statet.rj.data/.classpath
index 7728a88..78c94b4 100644
--- a/core/org.eclipse.statet.rj.data/.classpath
+++ b/core/org.eclipse.statet.rj.data/.classpath
@@ -11,5 +11,5 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
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 a575536..4ee5da9 100644
--- a/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.data/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.data
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Data (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0"
-Export-Package: org.eclipse.statet.rj.data;version="4.0.0",
- org.eclipse.statet.rj.data.impl;version="4.0.0"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0"
+Export-Package: org.eclipse.statet.rj.data;version="4.1.0",
+ org.eclipse.statet.rj.data.impl;version="4.1.0"
diff --git a/core/org.eclipse.statet.rj.data/build.properties b/core/org.eclipse.statet.rj.data/build.properties
index 9f02c9f..239dd55 100644
--- a/core/org.eclipse.statet.rj.data/build.properties
+++ b/core/org.eclipse.statet.rj.data/build.properties
@@ -1,5 +1,5 @@
source..= src/
-output..= bin/
+output..= target/classes/
javacDefaultEncoding..= UTF-8
bin.includes= META-INF/,\
diff --git a/core/org.eclipse.statet.rj.data/pom.xml b/core/org.eclipse.statet.rj.data/pom.xml
index 781b97f..71a7897 100644
--- a/core/org.eclipse.statet.rj.data/pom.xml
+++ b/core/org.eclipse.statet.rj.data/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.data</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/core/org.eclipse.statet.rj.server-tests/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.server-tests/META-INF/MANIFEST.MF
index 48250cb..db1a251 100644
--- a/core/org.eclipse.statet.rj.server-tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.server-tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server.tests
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Server - Tests (Incubation)
Fragment-Host: org.eclipse.statet.rj.server
diff --git a/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java b/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
index 0e6af5c..46d5979 100644
--- a/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
+++ b/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
@@ -36,7 +36,7 @@
@Test
public void detectLibPaths_DevFolder() throws Exception { // in IDE
final PathEntryProvider provider= PathEntryProvider.detectLibPaths(
- "file:/../org.eclipse.statet-rj/core/org.eclipse.statet.rj.server/bin/",
+ "file:/../org.eclipse.statet-rj/core/org.eclipse.statet.rj.server/target/classes/",
null );
assertEquals(DevBinPathEntryProvider.class, provider.getClass());
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 813e143..ae9e526 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: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Server - Remote Tools (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.server;bundle-version="[4.0.0,4.1.0)"
+Require-Bundle: org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.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 777da43..1b89cd9 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,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server.rpkg
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Server - R Package Skeleton + API (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.server;bundle-version="[4.0.0,4.1.0)"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0"
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.0)"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0"
diff --git a/core/org.eclipse.statet.rj.server/.classpath b/core/org.eclipse.statet.rj.server/.classpath
index 5a41d62..82e00e3 100644
--- a/core/org.eclipse.statet.rj.server/.classpath
+++ b/core/org.eclipse.statet.rj.server/.classpath
@@ -12,5 +12,5 @@
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="srcEExtensions"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
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 d0a941a..1f67fb7 100644
--- a/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.server/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.server;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Server - Core (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)",
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
org.eclipse.swt;bundle-version="3.6.0";resolution:=optional
Import-Package: org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.statet.jcommons.collections;version="4.0.0",
- org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.net;version="4.0.0",
- org.eclipse.statet.jcommons.rmi;version="4.0.0",
- org.eclipse.statet.jcommons.runtime;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0",
+ org.eclipse.statet.jcommons.collections;version="4.1.0",
+ org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.net;version="4.1.0",
+ org.eclipse.statet.jcommons.rmi;version="4.1.0",
+ org.eclipse.statet.jcommons.runtime;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0",
org.osgi.framework;resolution:=optional
Export-Package: org.eclipse.statet.rj,
org.eclipse.statet.rj.server,
diff --git a/core/org.eclipse.statet.rj.server/build.properties b/core/org.eclipse.statet.rj.server/build.properties
index d33d5e2..e89f437 100644
--- a/core/org.eclipse.statet.rj.server/build.properties
+++ b/core/org.eclipse.statet.rj.server/build.properties
@@ -1,6 +1,6 @@
source..= src/,\
srcEExtensions/
-output..= bin/
+output..= target/classes/
extra..= platform:/plugin/org.eclipse.core.runtime
javacDefaultEncoding..= UTF-8
diff --git a/core/org.eclipse.statet.rj.server/pom.xml b/core/org.eclipse.statet.rj.server/pom.xml
index caeaf09..8472a76 100644
--- a/core/org.eclipse.statet.rj.server/pom.xml
+++ b/core/org.eclipse.statet.rj.server/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.server</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/PathEntryProvider.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/PathEntryProvider.java
index 8ccbda8..b551e66 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/PathEntryProvider.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/PathEntryProvider.java
@@ -115,7 +115,7 @@
try (final DirectoryStream<Path> children= Files.newDirectoryStream(baseDirectory)) {
for (final Path child : children) {
final Path devBin;
- if (Files.isDirectory(devBin= child.resolve("bin"))) {
+ if (Files.isDirectory(devBin= child.resolve("target/classes"))) {
final String bundleId= child.getFileName().toString();
entries.add(new PathEntry(bundleId, devBin) {
@Override
@@ -124,7 +124,7 @@
if (path != null) {
return path;
}
- path= getPath().resolveSibling(resource);
+ path= getPath().getParent().resolveSibling(resource);
if (Files.exists(path)) {
return path;
}
@@ -147,7 +147,7 @@
private static final String JAR_REGEX= "\\Q.jar\\E";
private static final String AUTODETECT_REGEX=
"(?:" +
- "(" + FILE_PROTOCOL_REGEX + ".*)/" + BUNDLE_ID_REGEX + "\\Q/bin/\\E" + // match 1= file: ..
+ "(" + FILE_PROTOCOL_REGEX + ".*)/" + BUNDLE_ID_REGEX + "\\Q/target/classes/\\E" + // match 1= file: ..
"|" +
"(" + JAR_FILE_PROTOCOL_REGEX + ".*)/" + BUNDLE_ID_REGEX + // match 2= jar:file: ..
"(?:(" + VER_1_REGEX + ")|(" + VER_2_REGEX + "))?" + // match 3= ver_1, match 4= ver_2
diff --git a/core/org.eclipse.statet.rj.services.core/.classpath b/core/org.eclipse.statet.rj.services.core/.classpath
index 3852e5f..bad8616 100644
--- a/core/org.eclipse.statet.rj.services.core/.classpath
+++ b/core/org.eclipse.statet.rj.services.core/.classpath
@@ -14,5 +14,5 @@
<classpathentry kind="src" path="srcEnv"/>
<classpathentry kind="src" path="srcGraphic"/>
<classpathentry kind="src" path="srcToolService"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
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 34bb5db..1b3ed7e 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,23 +1,23 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.services.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - R Services API and Tools - Core (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)";visibility:=reexport
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)";visibility:=reexport
Import-Package: com.ibm.icu.text;version="62.1.0";resolution:=optional,
com.ibm.icu.util;version="62.1.0";resolution:=optional,
- org.eclipse.statet.jcommons.collections;version="4.0.0",
- org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.runtime;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0",
- org.eclipse.statet.jcommons.ts.core;version="4.0.0";resolution:=optional
-Export-Package: org.eclipse.statet.rj.graphic.core;version="4.0.0",
- org.eclipse.statet.rj.graphic.core.util;version="4.0.0",
- org.eclipse.statet.rj.renv.core;version="4.0.0",
- org.eclipse.statet.rj.renv.runtime;version="4.0.0",
- org.eclipse.statet.rj.services;version="4.0.0",
- org.eclipse.statet.rj.services.util;version="4.0.0",
- org.eclipse.statet.rj.services.util.dataaccess;version="4.0.0",
- org.eclipse.statet.rj.ts.core;version="4.0.0"
+ org.eclipse.statet.jcommons.collections;version="4.1.0",
+ org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.runtime;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0",
+ org.eclipse.statet.jcommons.ts.core;version="4.1.0";resolution:=optional
+Export-Package: org.eclipse.statet.rj.graphic.core;version="4.1.0",
+ org.eclipse.statet.rj.graphic.core.util;version="4.1.0",
+ org.eclipse.statet.rj.renv.core;version="4.1.0",
+ org.eclipse.statet.rj.renv.runtime;version="4.1.0",
+ org.eclipse.statet.rj.services;version="4.1.0",
+ org.eclipse.statet.rj.services.util;version="4.1.0",
+ org.eclipse.statet.rj.services.util.dataaccess;version="4.1.0",
+ org.eclipse.statet.rj.ts.core;version="4.1.0"
diff --git a/core/org.eclipse.statet.rj.services.core/build.properties b/core/org.eclipse.statet.rj.services.core/build.properties
index 26a51b9..34535e0 100644
--- a/core/org.eclipse.statet.rj.services.core/build.properties
+++ b/core/org.eclipse.statet.rj.services.core/build.properties
@@ -1,8 +1,8 @@
source..= src/,\
srcEnv/,\
srcGraphic/,\
- srcToolService
-output..= bin/
+ srcToolService/
+output..= target/classes/
javacDefaultEncoding..= UTF-8
bin.includes= META-INF/,\
diff --git a/core/org.eclipse.statet.rj.services.core/pom.xml b/core/org.eclipse.statet.rj.services.core/pom.xml
index a3495aa..0e7f445 100644
--- a/core/org.eclipse.statet.rj.services.core/pom.xml
+++ b/core/org.eclipse.statet.rj.services.core/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.services.core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 0d50f75..2e79740 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>org.eclipse.statet-rj</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj</groupId>
diff --git a/eclient/_assemblies/org.eclipse.statet.rj.eclient-feature/feature.xml b/eclient/_assemblies/org.eclipse.statet.rj.eclient-feature/feature.xml
index 1c46c8e..3568e19 100644
--- a/eclient/_assemblies/org.eclipse.statet.rj.eclient-feature/feature.xml
+++ b/eclient/_assemblies/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="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse StatET"
label="StatET RJ - Eclipse Client (Incubation)"
license-feature="org.eclipse.license"
@@ -20,7 +20,7 @@
</license>
<requires>
- <import feature="org.eclipse.statet.rj.core" version="4.0.0" match="equivalent"/>
+ <import feature="org.eclipse.statet.rj.core" version="4.1.0" match="equivalent"/>
</requires>
<plugin
diff --git a/eclient/_assemblies/pom.xml b/eclient/_assemblies/pom.xml
index ffa7b67..f5236a7 100644
--- a/eclient/_assemblies/pom.xml
+++ b/eclient/_assemblies/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.eclient</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
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 dd0d9dc..dce0a34 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: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Eclipse Client - Core (Incubation)
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)";visibility:=reexport,
- org.eclipse.statet.rj.services.core;bundle-version="[4.0.0,4.1.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)";visibility:=reexport,
+ org.eclipse.statet.rj.services.core;bundle-version="[4.1.0,4.2.0)";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="3.15.0"
-Export-Package: org.eclipse.statet.rj.rsetups;version="4.0.0"
+Export-Package: org.eclipse.statet.rj.rsetups;version="4.1.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 9c0ec28..bc22ece 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,24 +1,24 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.eclient.graphics;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Eclipse Client - R Graphics (Incubation)
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.statet.internal.rj.eclient.graphics.RGraphicsPlugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.services.core;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.client;bundle-version="[4.0.0,4.1.0)",
+Require-Bundle: org.eclipse.statet.rj.services.core;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.client;bundle-version="[4.1.0,4.2.0)",
org.eclipse.core.runtime;bundle-version="3.15.0",
org.eclipse.ui;bundle-version="3.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.uimisc;bundle-version="[4.1.0,4.2.0)"
+Import-Package: org.eclipse.statet.ecommons.collections;version="4.1.0",
org.eclipse.statet.ecommons.databinding,
- org.eclipse.statet.jcommons.collections;version="4.0.0",
- org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.runtime;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0",
- org.eclipse.statet.jcommons.ts.core;version="4.0.0"
+ org.eclipse.statet.jcommons.collections;version="4.1.0",
+ org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.runtime;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0",
+ org.eclipse.statet.jcommons.ts.core;version="4.1.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/eclient/org.eclipse.statet.rj.eclient/META-INF/MANIFEST.MF b/eclient/org.eclipse.statet.rj.eclient/META-INF/MANIFEST.MF
index 3fd95d7..4e5f974 100644
--- a/eclient/org.eclipse.statet.rj.eclient/META-INF/MANIFEST.MF
+++ b/eclient/org.eclipse.statet.rj.eclient/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.eclient;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - Eclipse Client (Incubation)
diff --git a/eclient/pom.xml b/eclient/pom.xml
index 65ae493..b228b4d 100644
--- a/eclient/pom.xml
+++ b/eclient/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>org.eclipse.statet-rj</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj</groupId>
diff --git a/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-feature/feature.xml b/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-feature/feature.xml
index 354530a..2f0f1d9 100644
--- a/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-feature/feature.xml
+++ b/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.statet.rj.example.rcpdemo2"
- version="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse StatET"
label="StatET RJ - RCP Demo 2 (Incubation)"
license-feature="org.eclipse.license"
@@ -20,7 +20,7 @@
</license>
<requires>
- <import feature="org.eclipse.statet.rj.eclient" version="4.0.0" match="equivalent"/>
+ <import feature="org.eclipse.statet.rj.eclient" version="4.1.0" match="equivalent"/>
</requires>
<plugin
diff --git a/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-product/rcpdemo.product b/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-product/rcpdemo.product
index 8bbf7d9..42caec4 100644
--- a/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-product/rcpdemo.product
+++ b/examples/_assemblies/org.eclipse.statet.rj.example.rcpdemo2-product/rcpdemo.product
@@ -17,7 +17,7 @@
-->
<product uid="rcpdemo" id="org.eclipse.statet.rj.example.rcpdemo2.product"
- version="4.0.0.qualifier"
+ version="4.1.0.qualifier"
application="org.eclipse.statet.rj.example.rcpdemo2.application"
name="RServi RCP Demo"
useFeatures="true"
diff --git a/examples/_assemblies/pom.xml b/examples/_assemblies/pom.xml
index ed16a07..4438eed 100644
--- a/examples/_assemblies/pom.xml
+++ b/examples/_assemblies/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.examples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
diff --git a/examples/org.eclipse.statet.rj.example.demo/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.example.demo/META-INF/MANIFEST.MF
index f2d31aa..7be3c30 100644
--- a/examples/org.eclipse.statet.rj.example.demo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.example.demo/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.example.demo
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - RServi Demo (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.servi;bundle-version="[4.0.0,4.1.0)",
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.servi;bundle-version="[4.1.0,4.2.0)",
org.eclipse.swt;bundle-version="3.4.0"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.runtime;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.runtime;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0"
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo1/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.example.rcpdemo1/META-INF/MANIFEST.MF
index 27c656f..4f17ca0 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo1/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo1/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.example.rcpdemo1;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - RServi RCP Demo 1 (Incubation)
Bundle-Activator: org.eclipse.statet.internal.rj.example.rcpdemo.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0",
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="[4.1.0,4.2.0)",
org.eclipse.core.runtime,
- org.eclipse.statet.rj.data;bundle-version="4.0.0",
- org.eclipse.statet.rj.server;bundle-version="4.0.0",
- org.eclipse.statet.rj.client;bundle-version="4.0.0",
- org.eclipse.statet.rj.servi;bundle-version="4.0.0",
+ org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.client;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.servi;bundle-version="[4.1.0,4.2.0)",
org.eclipse.ui,
- org.eclipse.statet.rj.eclient.core;bundle-version="4.0.0",
- org.eclipse.statet.rj.eclient.graphics;bundle-version="4.0.0"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.rmi;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0"
+ org.eclipse.statet.rj.eclient.core;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.eclient.graphics;bundle-version="[4.1.0,4.2.0)"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.rmi;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0"
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo2/META-INF/MANIFEST.MF b/examples/org.eclipse.statet.rj.example.rcpdemo2/META-INF/MANIFEST.MF
index 996e1a8..6316202 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo2/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo2/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.example.rcpdemo2;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - RServi RCP Demo 2 (Incubation)
Bundle-Activator: org.eclipse.statet.internal.rj.example.rcpdemo.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="[4.1.0,4.2.0)";visibility:=reexport,
org.eclipse.core.runtime,
- org.eclipse.statet.rj.data;bundle-version="4.0.0",
- org.eclipse.statet.rj.server;bundle-version="4.0.0",
- org.eclipse.statet.rj.client;bundle-version="4.0.0",
- org.eclipse.statet.rj.servi;bundle-version="4.0.0",
+ org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.client;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.servi;bundle-version="[4.1.0,4.2.0)",
org.eclipse.ui,
- org.eclipse.statet.rj.eclient.core;bundle-version="4.0.0",
- org.eclipse.statet.rj.eclient.graphics;bundle-version="4.0.0"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.rmi;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0",
- org.eclipse.statet.jcommons.ts.core;version="4.0.0"
+ org.eclipse.statet.rj.eclient.core;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.eclient.graphics;bundle-version="[4.1.0,4.2.0)"
+Import-Package: org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.rmi;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0",
+ org.eclipse.statet.jcommons.ts.core;version="4.1.0"
diff --git a/examples/pom.xml b/examples/pom.xml
index 2ffcd23..fee7335 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>org.eclipse.statet-rj</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj</groupId>
diff --git a/pom.xml b/pom.xml
index 82dac7d..32c9202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../org.eclipse.statet/releng/</relativePath>
</parent>
<artifactId>org.eclipse.statet-rj</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -46,7 +46,7 @@
<artifact>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>target-eclipse.ide</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</artifact>
</target>
</configuration>
diff --git a/servi/_assemblies/org.eclipse.statet.rj.servi.e-feature/feature.xml b/servi/_assemblies/org.eclipse.statet.rj.servi.e-feature/feature.xml
index 09416c8..596a743 100644
--- a/servi/_assemblies/org.eclipse.statet.rj.servi.e-feature/feature.xml
+++ b/servi/_assemblies/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="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse StatET"
label="StatET RJ - RServi E-Compilation (Incubation)"
license-feature="org.eclipse.license"
@@ -20,7 +20,7 @@
</license>
<requires>
- <import feature="org.eclipse.statet.rj.eclient" version="4.0.0" match="equivalent"/>
+ <import feature="org.eclipse.statet.rj.eclient" version="4.1.0" match="equivalent"/>
</requires>
<plugin
diff --git a/servi/_assemblies/pom.xml b/servi/_assemblies/pom.xml
index 0d6a23e..9bfeb22 100644
--- a/servi/_assemblies/pom.xml
+++ b/servi/_assemblies/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.servi</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
diff --git a/servi/_assemblies/repository/pom.xml b/servi/_assemblies/repository/pom.xml
index 2095f68..b83e4bb 100644
--- a/servi/_assemblies/repository/pom.xml
+++ b/servi/_assemblies/repository/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet.rj-assemblies</groupId>
<artifactId>rj.servi</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.servi.repository</artifactId>
diff --git a/servi/org.eclipse.statet.rj.servi-tests/META-INF/MANIFEST.MF b/servi/org.eclipse.statet.rj.servi-tests/META-INF/MANIFEST.MF
index aca624f..b805dad 100644
--- a/servi/org.eclipse.statet.rj.servi-tests/META-INF/MANIFEST.MF
+++ b/servi/org.eclipse.statet.rj.servi-tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi.tests
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - RServi - Tests (Incubation)
Fragment-Host: org.eclipse.statet.rj.servi
diff --git a/servi/org.eclipse.statet.rj.servi.webapp/pom.xml b/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
index 3ee8e38..6cf187a 100644
--- a/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
+++ b/servi/org.eclipse.statet.rj.servi.webapp/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.servi</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.servi.webapp</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>war</packaging>
<dependencies>
diff --git a/servi/org.eclipse.statet.rj.servi/.classpath b/servi/org.eclipse.statet.rj.servi/.classpath
index 8b52eff..27d8d4d 100644
--- a/servi/org.eclipse.statet.rj.servi/.classpath
+++ b/servi/org.eclipse.statet.rj.servi/.classpath
@@ -13,5 +13,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="srcServer"/>
<classpathentry kind="src" path="srcServiPool"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
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 80ca14b..203c70f 100644
--- a/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF
+++ b/servi/org.eclipse.statet.rj.servi/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.statet.rj.servi;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET RJ - RServi (Incubation)
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.server;bundle-version="[4.0.0,4.1.0)",
- org.eclipse.statet.rj.services.core;bundle-version="[4.0.0,4.1.0)";visibility:=reexport,
- org.eclipse.statet.rj.client;bundle-version="[4.0.0,4.1.0)"
+Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.server;bundle-version="[4.1.0,4.2.0)",
+ org.eclipse.statet.rj.services.core;bundle-version="[4.1.0,4.2.0)";visibility:=reexport,
+ org.eclipse.statet.rj.client;bundle-version="[4.1.0,4.2.0)"
Import-Package: org.apache.commons.pool2;version="[2.6.2,3.0.0)";resolution:=optional,
org.apache.commons.pool2.impl;version="[2.6.2,3.0.0)";resolution:=optional,
- org.eclipse.statet.jcommons.collections;version="4.0.0",
- org.eclipse.statet.jcommons.lang;version="4.0.0",
- org.eclipse.statet.jcommons.rmi;version="4.0.0",
- org.eclipse.statet.jcommons.runtime;version="4.0.0",
- org.eclipse.statet.jcommons.status;version="4.0.0"
+ org.eclipse.statet.jcommons.collections;version="4.1.0",
+ org.eclipse.statet.jcommons.lang;version="4.1.0",
+ org.eclipse.statet.jcommons.rmi;version="4.1.0",
+ org.eclipse.statet.jcommons.runtime;version="4.1.0",
+ org.eclipse.statet.jcommons.status;version="4.1.0"
Export-Package: org.eclipse.statet.internal.rj.servi;x-internal:=true,
- org.eclipse.statet.rj.servi;version="4.0.0",
+ org.eclipse.statet.rj.servi;version="4.1.0",
org.eclipse.statet.rj.servi.node,
org.eclipse.statet.rj.servi.pool
diff --git a/servi/org.eclipse.statet.rj.servi/build.properties b/servi/org.eclipse.statet.rj.servi/build.properties
index 6c9f984..a9c6143 100644
--- a/servi/org.eclipse.statet.rj.servi/build.properties
+++ b/servi/org.eclipse.statet.rj.servi/build.properties
@@ -1,7 +1,7 @@
source..= src/,\
srcServer/,\
srcServiPool/
-output..= bin/
+output..= target/classes/
javacDefaultEncoding..= UTF-8
bin.includes= META-INF/,\
diff --git a/servi/org.eclipse.statet.rj.servi/pom.xml b/servi/org.eclipse.statet.rj.servi/pom.xml
index 85c65d0..f38f4f3 100644
--- a/servi/org.eclipse.statet.rj.servi/pom.xml
+++ b/servi/org.eclipse.statet.rj.servi/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.statet.rj</groupId>
<artifactId>rj.servi</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.statet.rj.servi</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/servi/pom.xml b/servi/pom.xml
index 5dc62d1..9d10b37 100644
--- a/servi/pom.xml
+++ b/servi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.statet-releng</groupId>
<artifactId>org.eclipse.statet-rj</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.statet.rj</groupId>
