You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/06/17 06:40:42 UTC
[camel-karaf] branch main updated (f2c11e8e -> 5163271e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from f2c11e8e Regen
new 2e26ad6e CAMEL-18184: Deprecate the old junit 4.x
new 5163271e Camel 18184/camel test blueprint junit5
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/camel-karaf-bom/pom.xml | 5 +++++
components/camel-test-blueprint/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../camel-test-blueprint/src/generated/resources/test-blueprint.json | 2 +-
pom.xml | 5 +++++
tests/camel-blueprint-test/pom.xml | 2 +-
.../blueprint/BlueprintResolveComponentFromCamelContextTest.java | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
8 files changed, 16 insertions(+), 6 deletions(-)
[camel-karaf] 02/02: Camel 18184/camel test blueprint junit5
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 5163271e63c1996ce1e125829334e3de99b1a980
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 17 08:40:28 2022 +0200
Camel 18184/camel test blueprint junit5
---
bom/camel-karaf-bom/pom.xml | 5 +++++
pom.xml | 5 +++++
tests/camel-blueprint-test/pom.xml | 2 +-
.../blueprint/BlueprintResolveComponentFromCamelContextTest.java | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
index a09cea76..c90ed4fe 100644
--- a/bom/camel-karaf-bom/pom.xml
+++ b/bom/camel-karaf-bom/pom.xml
@@ -91,6 +91,11 @@
<artifactId>camel-test-blueprint</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-test-blueprint-junit5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-test-karaf</artifactId>
diff --git a/pom.xml b/pom.xml
index 999baaaf..d1f80395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,6 +362,11 @@
<artifactId>camel-test-blueprint</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-test-blueprint-junit5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-cxf-blueprint</artifactId>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index ad1aaa2c..aa225032 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
- <artifactId>camel-test-blueprint</artifactId>
+ <artifactId>camel-test-blueprint-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java
index 8f8d7ba6..4563db54 100644
--- a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java
+++ b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class BlueprintResolveComponentFromCamelContextTest extends CamelBlueprintTestSupport {
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 4799aa3f..83d4bd5b 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
- <artifactId>camel-blueprint</artifactId>
+ <artifactId>camel-test-blueprint-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel-karaf] 01/02: CAMEL-18184: Deprecate the old junit 4.x
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 2e26ad6edd17e77e4ee61d4ca035538b59ce4183
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 17 06:53:10 2022 +0200
CAMEL-18184: Deprecate the old junit 4.x
---
components/camel-test-blueprint/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../camel-test-blueprint/src/generated/resources/test-blueprint.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index a0e6866f..2f010649 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-test-blueprint</artifactId>
<packaging>jar</packaging>
- <name>Camel Karaf :: Test :: Blueprint</name>
+ <name>Camel Karaf :: Test :: Blueprint (deprecated)</name>
<description>Camel unit testing with OSGi Blueprint</description>
<properties>
diff --git a/components/camel-test-blueprint/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test-blueprint/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index ceeb05b2..f4e09342 100644
--- a/components/camel-test-blueprint/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test-blueprint/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=test-blueprint
groupId=org.apache.camel.karaf
artifactId=camel-test-blueprint
version=3.18.0-SNAPSHOT
-projectName=Camel Karaf :: Test :: Blueprint
+projectName=Camel Karaf :: Test :: Blueprint (deprecated)
projectDescription=Camel unit testing with OSGi Blueprint
diff --git a/components/camel-test-blueprint/src/generated/resources/test-blueprint.json b/components/camel-test-blueprint/src/generated/resources/test-blueprint.json
index e9339a46..045f9106 100644
--- a/components/camel-test-blueprint/src/generated/resources/test-blueprint.json
+++ b/components/camel-test-blueprint/src/generated/resources/test-blueprint.json
@@ -4,7 +4,7 @@
"name": "test-blueprint",
"title": "Test Blueprint",
"description": "Camel unit testing with OSGi Blueprint",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.10.0",
"label": "testing,java,osgi",
"supportLevel": "Stable",