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 2023/02/09 16:26:12 UTC
[camel-spring-boot] branch main updated: BOMs cleanup (#743)
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 112012c3874 BOMs cleanup (#743)
112012c3874 is described below
commit 112012c387484cb1264bc7f9217375bf216ecc9a
Author: Federico Mariani <34...@users.noreply.github.com>
AuthorDate: Thu Feb 9 17:26:06 2023 +0100
BOMs cleanup (#743)
---
.../camel/itest/springboot/CamelServletTest.java | 2 +-
tooling/camel-spring-boot-bom/pom.xml | 5 ---
.../pom.xml | 10 ++++-
tooling/camel-spring-boot-dependencies/pom.xml | 51 ----------------------
.../camel/springboot/maven/BomGeneratorMojo.java | 5 ---
5 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
index b579ec46be1..fc2f20b38bd 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
@@ -37,7 +37,7 @@ public class CamelServletTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelServletTest.class))
// .dependency(DependencyResolver.withVersion("org.springframework.boot:spring-boot-starter-web"))
// .dependency(DependencyResolver.withVersion("org.springframework:spring-webmvc"))
- .dependency("javax.servlet:javax.servlet-api")
+ .dependency("jakarta.servlet:jakarta.servlet-api")
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|ExposedServletEndpointURIToJMXTest$.*Arquillian.*)")
.build();
}
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 04e3a50b604..92e27937e57 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -1708,11 +1708,6 @@
<artifactId>camel-zookeeper-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-management</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies-generator/pom.xml b/tooling/camel-spring-boot-dependencies-generator/pom.xml
index 8749d566999..4102916ff02 100644
--- a/tooling/camel-spring-boot-dependencies-generator/pom.xml
+++ b/tooling/camel-spring-boot-dependencies-generator/pom.xml
@@ -210,8 +210,16 @@
<!-- Modified on Camel due to CAMEL-17435 -->
<exclude>com.sun.xml.messaging.saaj:saaj-impl:*</exclude>
+ <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
+ <exclude>jakarta.servlet:jakarta.servlet-api</exclude>
+ <exclude>jakarta.jms:jakarta.jms-api</exclude>
+ <exclude>jakarta.jws:jakarta.jws-api</exclude>
+ <exclude>jakarta.persistence:jakarta.persistence-api</exclude>
+ <exclude>jakarta.transaction:jakarta.transaction-api</exclude>
+ <exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
+ <exclude>javax.annotation:jsr250-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api:*</exclude>
- <exclude>javax.annotation:javax.annotation-api:*</exclude>
+ <exclude>jakarta.xml.soap:jakarta.xml.soap-api</exclude>
<exclude>javax.xml.ws:jaxws-api:*</exclude>
<exclude>org.glassfish.jaxb:jaxb-runtime:*</exclude>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 44d6faeab06..8c9bc29fd10 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -161,57 +161,6 @@
<artifactId>directory-watcher</artifactId>
<version>0.17.1</version>
</dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jms</groupId>
- <artifactId>jakarta.jms-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>4.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
index d8a5aa7665d..950f9f0d26c 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
@@ -215,11 +215,6 @@ public class BomGeneratorMojo extends AbstractMojo {
// include some dependencies for testing and management
dep = new Dependency();
dep.setGroupId("org.apache.camel");
- dep.setArtifactId("camel-management");
- dep.setVersion("${project.version}");
- outDependencies.add(dep);
- dep = new Dependency();
- dep.setGroupId("org.apache.camel");
dep.setArtifactId("camel-test-spring");
dep.setVersion("${project.version}");
outDependencies.add(dep);