Merge branch 'ecchronos-4.0'

.github/workflows/actions.yml

@@ -30,10 +30,6 @@ jobs:
  - name: "Style check - Java 11"
  java_version: 11
  test_suite: 'compile com.mycila:license-maven-plugin:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check javadoc:jar'
- - name: "OSGi integration - Java 11"
- java_version: 11
- test_suite: 'install -P docker-integration-test,osgi-integration-tests -DskipUTs'
- artifacts_dir: "osgi-integration/target"
  - name: "Standalone integration 4.0 - Java 11"
  java_version: 11
  test_suite: 'verify -P docker-integration-test,standalone-integration-tests -DskipUTs'
@@ -58,10 +54,6 @@ jobs:
  - name: "Style check - Java 17"
  java_version: 17
  test_suite: 'compile -Djava.version=17 com.mycila:license-maven-plugin:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check javadoc:jar'
- - name: "OSGi integration - Java 17"
- java_version: 17
- test_suite: 'install -P docker-integration-test,osgi-integration-tests -Djava.version=17 -DskipUTs'
- artifacts_dir: "osgi-integration/target"
  - name: "Standalone integration 4.0 - Java 17"
  java_version: 17
  test_suite: 'verify -P docker-integration-test,standalone-integration-tests -Djava.version=17 -DskipUTs'
@@ -141,9 +133,7 @@ jobs:
  fail_ci_if_error: false
  files: >
  ./rest/target/site/jacoco/jacoco.xml,
- ./core.osgi/target/site/jacoco/jacoco.xml,
  ./application/target/site/jacoco/jacoco.xml,
- ./osgi-integration/target/site/jacoco/jacoco.xml,
  ./core/target/site/jacoco/jacoco.xml,
  ./fm.impl/target/site/jacoco/jacoco.xml,
  ./connection/target/site/jacoco/jacoco.xml

CHANGES.md

@@ -34,6 +34,12 @@
 
 ## Merged from Version 4.0
 
+## Version 4.0.7
+
+* Removes OSGI/Karaf support - Issue #657
+
+## Version 4.0.6
+
 * Separate serial consistency configuration from remoteRouting functionality - Issue #633
 
 ## Version 5.0.0

connection.impl/pom.xml

@@ -47,15 +47,10 @@
  </dependency>
 
  <!-- OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
 
  <dependency>
  <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
  <scope>provided</scope>
  </dependency>