diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d104e2115b04e1dcf8c2d4ee8f0b89e3b4fdc64..6c5b18d10275048816c097b41b0e0a9dd105cd23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ cache:
build-parent:
stage: build-parent
script:
- - 'mvn $MAVEN_CLI_OPTS -N clean install sonar:sonar -Dsonar.projectKey=$SONAR_KEY_CDO -Dsonar.host.url=$SONAR_HOST -Dsonar.login=$SONAR_LOGIN_CDO'
+ - 'mvn $MAVEN_CLI_OPTS -N clean install'
build-client:
stage: build-client
@@ -52,4 +52,3 @@ build-server-docker:
- echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
- docker build -t $CI_REGISTRY_IMAGE/cdo-server:$CI_COMMIT_BRANCH .
- docker push $CI_REGISTRY_IMAGE/cdo-server:$CI_COMMIT_BRANCH
-
diff --git a/cdo_client_oxygen/META-INF/MANIFEST.MF b/cdo_client_oxygen/META-INF/MANIFEST.MF
index 51decd659598d977ee5868302cb3ee9ca41cb769..38ec6446068d869a04df01aa7750d047ec86b780 100644
--- a/cdo_client_oxygen/META-INF/MANIFEST.MF
+++ b/cdo_client_oxygen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: client;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.net4j,
org.eclipse.emf.cdo,
org.eclipse.emf.ecore,
org.eclipse.net4j.tcp,
- camel;bundle-version="3.0.0",
+ camel;bundle-version="3.1.0",
org.eclipse.xtext,
org.eclipse.ocl,
org.eclipse.ocl.uml,
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.net4j,
org.eclipse.ocl.xtext.oclinecore,
org.eclipse.ocl.xtext.oclstdlib,
org.eclipse.ocl.xtext.completeocl,
- camel.dsl;bundle-version="3.0.0"
+ camel.dsl;bundle-version="3.1.0"
Bundle-ActivationPolicy: lazy
Import-Package:
org.apache.log4j,
diff --git a/cdo_client_oxygen/pom.xml b/cdo_client_oxygen/pom.xml
index 609d05995a5a1217522da3a9e107b121941d9f44..c3d40c1230e8ec917f01a9d12d975753e93d62d8 100644
--- a/cdo_client_oxygen/pom.xml
+++ b/cdo_client_oxygen/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
client
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
eclipse-plugin
CDO - Cdo Client Oxygen
@@ -10,7 +10,7 @@
eu.melodic.cdo
parent
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
diff --git a/cdo_server_oxygen/pom.xml b/cdo_server_oxygen/pom.xml
index 96dae4925c9a10a16b17a105e827349db6b045ec..aa0c3776aae301cc5962c7aebcbdef1ec9f2900e 100644
--- a/cdo_server_oxygen/pom.xml
+++ b/cdo_server_oxygen/pom.xml
@@ -2,14 +2,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
server
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
CDO - Cdo Server Oxygen
pom
eu.melodic.cdo
parent
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
diff --git a/cdo_server_oxygen/server-core/pom.xml b/cdo_server_oxygen/server-core/pom.xml
index a175b77b86a64d57e5c022b470a89984fce5800b..a1af1265030351c4a21e55f6ad2445f109dc1dfe 100644
--- a/cdo_server_oxygen/server-core/pom.xml
+++ b/cdo_server_oxygen/server-core/pom.xml
@@ -3,14 +3,14 @@
4.0.0
server-core
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
CDO - Cdo Server Core
eu.melodic.cdo
server
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
@@ -78,7 +78,7 @@
eu.melodic.cdo
server-deps
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
repackaged
diff --git a/cdo_server_oxygen/server-deps/META-INF/MANIFEST.MF b/cdo_server_oxygen/server-deps/META-INF/MANIFEST.MF
index fb800c9123bc82f63f127fadd6b2931c1bc6160a..6f571cea887f5187b1cac4e3911861408dc28ea4 100644
--- a/cdo_server_oxygen/server-deps/META-INF/MANIFEST.MF
+++ b/cdo_server_oxygen/server-deps/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-SymbolicName: server-deps
Bundle-Name: server-deps
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-ManifestVersion: 2
Export-Package: .
Require-Bundle: org.eclipse.emf.cdo.server,
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.common,
org.eclipse.emf.ecore,
org.eclipse.net4j.util,
- camel;bundle-version="3.0.0"
+ camel;bundle-version="3.1.0"
Import-Package: com.mysql.jdbc,
javax.persistence,
org.apache.commons.logging,
diff --git a/cdo_server_oxygen/server-deps/pom.xml b/cdo_server_oxygen/server-deps/pom.xml
index 1623506f608929c42aa937d69db9eb41ca5e6feb..d16ff12664b6e74a284bfd3cc6a599a0c257edcd 100644
--- a/cdo_server_oxygen/server-deps/pom.xml
+++ b/cdo_server_oxygen/server-deps/pom.xml
@@ -2,14 +2,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
server-deps
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
CDO - Cdo Server Dependencies
eclipse-plugin
eu.melodic.cdo
server
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index dc26701fd2e59bd9901ffee83b5dbf97b0a5a22b..e539892660ea367437f0d31d7227ed5cfeba32a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
eu.melodic.cdo
parent
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
pom
CDO
@@ -32,7 +32,7 @@
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
UTF-8