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 2021/08/26 12:37:22 UTC
[camel] 01/02: CAMEL-16184: Deprecate the junit 4.x test modules
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.git
commit e8ea1a21603dc010fe6966016a0f6aa662814635
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 26 14:33:40 2021 +0200
CAMEL-16184: Deprecate the junit 4.x test modules
---
.../resources/org/apache/camel/catalog/others/test-spring.json | 2 +-
.../org/apache/camel/catalog/others/testcontainers-spring.json | 2 +-
.../resources/org/apache/camel/catalog/others/testcontainers.json | 2 +-
components/camel-test/camel-test-spring/pom.xml | 3 +--
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../camel-test-spring/src/generated/resources/test-spring.json | 2 +-
.../camel-test/camel-test-spring/src/main/docs/test-spring.adoc | 5 +++--
components/camel-test/camel-test/pom.xml | 3 +--
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
components/camel-test/camel-test/src/generated/resources/test.json | 2 +-
components/camel-test/camel-test/src/main/docs/test.adoc | 5 +++--
components/camel-test/camel-testcontainers-spring-junit5/pom.xml | 1 -
components/camel-test/camel-testcontainers-spring/pom.xml | 3 +--
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/testcontainers-spring.json | 2 +-
.../src/main/docs/testcontainers-spring.adoc | 5 +++--
components/camel-test/camel-testcontainers/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../camel-testcontainers/src/generated/resources/testcontainers.json | 2 +-
.../camel-testcontainers/src/main/docs/testcontainers.adoc | 5 +++--
docs/components/modules/others/pages/test-spring.adoc | 5 +++--
docs/components/modules/others/pages/test.adoc | 5 +++--
docs/components/modules/others/pages/testcontainers-spring.adoc | 5 +++--
docs/components/modules/others/pages/testcontainers.adoc | 5 +++--
24 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
index 3b78725..f6943a7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
@@ -4,7 +4,7 @@
"name": "test-spring",
"title": "Test Spring",
"description": "Camel unit testing with Spring",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.10.0",
"label": "testing,java,spring",
"supportLevel": "Stable",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
index acae457..4d8b143 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
@@ -4,7 +4,7 @@
"name": "testcontainers-spring",
"title": "Testcontainers Spring",
"description": "Camel unit testing with Spring and testcontainers",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.22.0",
"label": "testing,java,docker",
"supportLevel": "Stable",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
index d672a8d..4f9568a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
@@ -4,7 +4,7 @@
"name": "testcontainers",
"title": "Testcontainers",
"description": "Camel support for testcontainers",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.22.0",
"label": "testing,java,docker",
"supportLevel": "Stable",
diff --git a/components/camel-test/camel-test-spring/pom.xml b/components/camel-test/camel-test-spring/pom.xml
index 7f2025f..4a0e4ba 100644
--- a/components/camel-test/camel-test-spring/pom.xml
+++ b/components/camel-test/camel-test-spring/pom.xml
@@ -29,13 +29,12 @@
<artifactId>camel-test-spring</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Test :: Spring</name>
+ <name>Camel :: Test :: Spring (deprecated)</name>
<description>Camel unit testing with Spring</description>
<properties>
<firstVersion>2.10.0</firstVersion>
<label>testing,java,spring</label>
-
<spring-version>${spring5-version}</spring-version>
</properties>
diff --git a/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index ccf0e66..079f982 100644
--- a/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=test-spring
groupId=org.apache.camel
artifactId=camel-test-spring
version=3.12.0-SNAPSHOT
-projectName=Camel :: Test :: Spring
+projectName=Camel :: Test :: Spring (deprecated)
projectDescription=Camel unit testing with Spring
diff --git a/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json b/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
index 3b78725..f6943a7 100644
--- a/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
+++ b/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
@@ -4,7 +4,7 @@
"name": "test-spring",
"title": "Test Spring",
"description": "Camel unit testing with Spring",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.10.0",
"label": "testing,java,spring",
"supportLevel": "Stable",
diff --git a/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc b/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
index 6d54062..6997df8 100644
--- a/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
+++ b/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
@@ -1,10 +1,11 @@
[[test-spring-other]]
-= Test Spring Component
+= Test Spring Component (deprecated)
:docTitle: Test Spring
:artifactId: camel-test-spring
:description: Camel unit testing with Spring
:since: 2.10
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test-spring.adoc[opts=optional]
*Since Camel {since}*
diff --git a/components/camel-test/camel-test/pom.xml b/components/camel-test/camel-test/pom.xml
index 7145d12..c09dbf6 100644
--- a/components/camel-test/camel-test/pom.xml
+++ b/components/camel-test/camel-test/pom.xml
@@ -29,13 +29,12 @@
<artifactId>camel-test</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Test</name>
+ <name>Camel :: Test (deprecated)</name>
<description>Camel unit testing</description>
<properties>
<firstVersion>2.9.0</firstVersion>
<label>testing,java</label>
-
</properties>
<dependencies>
diff --git a/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index fd8fb90..bca168d 100644
--- a/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=test
groupId=org.apache.camel
artifactId=camel-test
version=3.12.0-SNAPSHOT
-projectName=Camel :: Test
+projectName=Camel :: Test (deprecated)
projectDescription=Camel unit testing
diff --git a/components/camel-test/camel-test/src/generated/resources/test.json b/components/camel-test/camel-test/src/generated/resources/test.json
index 582dae2..a116e8d 100644
--- a/components/camel-test/camel-test/src/generated/resources/test.json
+++ b/components/camel-test/camel-test/src/generated/resources/test.json
@@ -4,7 +4,7 @@
"name": "test",
"title": "Test",
"description": "Camel unit testing",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.9.0",
"label": "testing,java",
"supportLevel": "Stable",
diff --git a/components/camel-test/camel-test/src/main/docs/test.adoc b/components/camel-test/camel-test/src/main/docs/test.adoc
index 3701a5e..eb7ec22 100644
--- a/components/camel-test/camel-test/src/main/docs/test.adoc
+++ b/components/camel-test/camel-test/src/main/docs/test.adoc
@@ -1,10 +1,11 @@
[[test-other]]
-= Test Component
+= Test Component (deprecated)
:docTitle: Test
:artifactId: camel-test
:description: Camel unit testing
:since: 2.9
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test.adoc[opts=optional]
*Since Camel {since}*
diff --git a/components/camel-test/camel-testcontainers-spring-junit5/pom.xml b/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
index 704359a..54f07bf 100644
--- a/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
+++ b/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
@@ -35,7 +35,6 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>testing,java,docker</label>
-
</properties>
<dependencies>
diff --git a/components/camel-test/camel-testcontainers-spring/pom.xml b/components/camel-test/camel-testcontainers-spring/pom.xml
index 60f5d14..2acc937 100644
--- a/components/camel-test/camel-testcontainers-spring/pom.xml
+++ b/components/camel-test/camel-testcontainers-spring/pom.xml
@@ -29,13 +29,12 @@
<artifactId>camel-testcontainers-spring</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Testcontainers :: Spring</name>
+ <name>Camel :: Testcontainers :: Spring (deprecated)</name>
<description>Camel unit testing with Spring and testcontainers</description>
<properties>
<firstVersion>2.22.0</firstVersion>
<label>testing,java,docker</label>
-
</properties>
<dependencies>
diff --git a/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 35b90df..3577ef0 100644
--- a/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=testcontainers-spring
groupId=org.apache.camel
artifactId=camel-testcontainers-spring
version=3.12.0-SNAPSHOT
-projectName=Camel :: Testcontainers :: Spring
+projectName=Camel :: Testcontainers :: Spring (deprecated)
projectDescription=Camel unit testing with Spring and testcontainers
diff --git a/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json b/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
index acae457..4d8b143 100644
--- a/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
+++ b/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
@@ -4,7 +4,7 @@
"name": "testcontainers-spring",
"title": "Testcontainers Spring",
"description": "Camel unit testing with Spring and testcontainers",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.22.0",
"label": "testing,java,docker",
"supportLevel": "Stable",
diff --git a/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc b/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
index 5ec022d..699dee4 100644
--- a/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
+++ b/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
@@ -1,10 +1,11 @@
[[testcontainers-spring-other]]
-= Testcontainers Spring Component
+= Testcontainers Spring Component (deprecated)
:docTitle: Testcontainers Spring
:artifactId: camel-testcontainers-spring
:description: Camel unit testing with Spring and testcontainers
:since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers-spring.adoc[opts=optional]
*Since Camel {since}*
diff --git a/components/camel-test/camel-testcontainers/pom.xml b/components/camel-test/camel-testcontainers/pom.xml
index e2e0fbf..147dbf4 100644
--- a/components/camel-test/camel-testcontainers/pom.xml
+++ b/components/camel-test/camel-testcontainers/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-testcontainers</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Testcontainers</name>
+ <name>Camel :: Testcontainers (deprecated)</name>
<description>Camel support for testcontainers</description>
<properties>
diff --git a/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 4dba38d..0569b5c 100644
--- a/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=testcontainers
groupId=org.apache.camel
artifactId=camel-testcontainers
version=3.12.0-SNAPSHOT
-projectName=Camel :: Testcontainers
+projectName=Camel :: Testcontainers (deprecated)
projectDescription=Camel support for testcontainers
diff --git a/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json b/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
index d672a8d..4f9568a 100644
--- a/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
+++ b/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
@@ -4,7 +4,7 @@
"name": "testcontainers",
"title": "Testcontainers",
"description": "Camel support for testcontainers",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.22.0",
"label": "testing,java,docker",
"supportLevel": "Stable",
diff --git a/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc b/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
index 3d0b330..17381a0 100644
--- a/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
+++ b/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
@@ -1,10 +1,11 @@
[[testcontainers-other]]
-= Testcontainers Component
+= Testcontainers Component (deprecated)
:docTitle: Testcontainers
:artifactId: camel-testcontainers
:description: Camel support for testcontainers
:since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers.adoc[opts=optional]
*Since Camel {since}*
diff --git a/docs/components/modules/others/pages/test-spring.adoc b/docs/components/modules/others/pages/test-spring.adoc
index 0e9341f..311a17b 100644
--- a/docs/components/modules/others/pages/test-spring.adoc
+++ b/docs/components/modules/others/pages/test-spring.adoc
@@ -1,12 +1,13 @@
[[test-spring-other]]
-= Test Spring Component
+= Test Spring Component (deprecated)
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
:docTitle: Test Spring
:artifactId: camel-test-spring
:description: Camel unit testing with Spring
:since: 2.10
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test-spring.adoc[opts=optional]
*Since Camel {since}*
diff --git a/docs/components/modules/others/pages/test.adoc b/docs/components/modules/others/pages/test.adoc
index 8cace19..be93e9d 100644
--- a/docs/components/modules/others/pages/test.adoc
+++ b/docs/components/modules/others/pages/test.adoc
@@ -1,12 +1,13 @@
[[test-other]]
-= Test Component
+= Test Component (deprecated)
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-test/camel-test/src/main/docs/test.adoc
:docTitle: Test
:artifactId: camel-test
:description: Camel unit testing
:since: 2.9
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test.adoc[opts=optional]
*Since Camel {since}*
diff --git a/docs/components/modules/others/pages/testcontainers-spring.adoc b/docs/components/modules/others/pages/testcontainers-spring.adoc
index e66fae8..e306db2 100644
--- a/docs/components/modules/others/pages/testcontainers-spring.adoc
+++ b/docs/components/modules/others/pages/testcontainers-spring.adoc
@@ -1,12 +1,13 @@
[[testcontainers-spring-other]]
-= Testcontainers Spring Component
+= Testcontainers Spring Component (deprecated)
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
:docTitle: Testcontainers Spring
:artifactId: camel-testcontainers-spring
:description: Camel unit testing with Spring and testcontainers
:since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers-spring.adoc[opts=optional]
*Since Camel {since}*
diff --git a/docs/components/modules/others/pages/testcontainers.adoc b/docs/components/modules/others/pages/testcontainers.adoc
index fd83908..d818159 100644
--- a/docs/components/modules/others/pages/testcontainers.adoc
+++ b/docs/components/modules/others/pages/testcontainers.adoc
@@ -1,12 +1,13 @@
[[testcontainers-other]]
-= Testcontainers Component
+= Testcontainers Component (deprecated)
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
:docTitle: Testcontainers
:artifactId: camel-testcontainers
:description: Camel support for testcontainers
:since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers.adoc[opts=optional]
*Since Camel {since}*