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
commit d8e0ac63c326e7cf495078a1bf7b1b4606bdec0b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 9 21:46:17 2023 +0200
Migrate to SB3
---
.../src/test/resources/application-pom-sb2.xml | 143 ---------------------
...ication-pom-sb1.xml => application-pom-sb3.xml} | 16 ++-
2 files changed, 11 insertions(+), 148 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
deleted file mode 100644
index 1137e59a9c6..00000000000
--- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.company</groupId>
- <artifactId>spring-boot-application</artifactId>
- <version>1.0</version>
-
- <name>Spring-Boot Application</name>
- <description>This a the base pom of spring-boot applications launched by
the users</description>
-
- <dependencyManagement>
- <dependencies>
-
- <!-- The two BOMs -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>#{module}-starter</artifactId>
- </dependency>
-
- <!-- Required by the integration tests to run in Junit5 -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Required for UnitTestCommand -->
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- DEPENDENCIES -->
-
- </dependencies>
-
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven Central</name>
- <url>https://repo1.maven.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>atlassian-public</id>
- <name>Atlassian Public</name>
- <url>https://maven.atlassian.com/repository/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${glassfish-jaxb-runtime-version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
diff --git
a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
similarity index 88%
rename from
tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
rename to
tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
index 2bda7e4e2cd..d10e98b54ac 100644
--- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
+++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
@@ -63,10 +63,17 @@
<artifactId>#{module}-starter</artifactId>
</dependency>
- <!-- Required by the integration tests to run -->
+ <!-- Required by the integration tests to run in Junit5 -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Required for UnitTestCommand -->
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
</dependency>
<!-- DEPENDENCIES -->
@@ -88,7 +95,7 @@
<repository>
<id>apache-snapshots</id>
<name>Apache Snapshots</name>
- <url>http://repository.apache.org/snapshots/</url>
+ <url>https://repository.apache.org/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
@@ -108,5 +115,4 @@
</snapshots>
</repository>
</repositories>
-
</project>
