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/06/09 19:50:23 UTC
[camel-spring-boot] branch main updated (fd9f68ec9f3 -> d5ec33d2a92)
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-spring-boot.git
from fd9f68ec9f3 Remove hadoop stuff not in use
new 66a0eb965a6 Remove asciidoctorj as no longer in use
new bf55b196523 Remove not in use
new d8e0ac63c32 Migrate to SB3
new d5ec33d2a92 Remove cruft
The 4 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:
pom.xml | 32 +----
.../src/test/resources/application-pom-sb2.xml | 143 ---------------------
...ication-pom-sb1.xml => application-pom-sb3.xml} | 16 ++-
.../pom.xml | 7 -
4 files changed, 13 insertions(+), 185 deletions(-)
delete mode 100644 tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
rename tests/camel-itest-spring-boot/src/test/resources/{application-pom-sb1.xml => application-pom-sb3.xml} (88%)
[camel-spring-boot] 04/04: Remove cruft
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-spring-boot.git
commit d5ec33d2a927c3b28295c6a3d1a5e61d84fb4d69
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 21:48:37 2023 +0200
Remove cruft
---
pom.xml | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index b686df1e0bc..6c82f016d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,6 @@
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.7.0.Alpha10</arquillian-version>
<avro-version>1.11.0</avro-version>
- <glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
<groovy-version>4.0.12</groovy-version>
<jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
<jaxb-version>2.3.0</jaxb-version>
@@ -661,31 +660,6 @@
</pluginManagement>
</build>
</profile>
-
- <profile>
- <id>jdk8-build</id>
- <activation>
- <jdk>(,1.9)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<id>deploy</id>
<build>
@@ -881,8 +855,8 @@
<version>${cyclonedx-maven-plugin-version}</version>
<inherited>false</inherited>
<configuration>
- <outputName>camel-spring-boot-sbom</outputName>
- <outputDirectory>${project.basedir}/camel-spring-boot-sbom/</outputDirectory>
+ <outputName>camel-spring-boot-sbom</outputName>
+ <outputDirectory>${project.basedir}/camel-spring-boot-sbom/</outputDirectory>
</configuration>
<executions>
<execution>
[camel-spring-boot] 01/04: Remove asciidoctorj as no longer in use
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-spring-boot.git
commit 66a0eb965a67038bfbd0fc458ee10b717b1f8250
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 21:42:18 2023 +0200
Remove asciidoctorj as no longer in use
---
pom.xml | 1 -
tooling/camel-spring-boot-generator-maven-plugin/pom.xml | 7 -------
2 files changed, 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 727c8acba8d..a5c33f65913 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,6 @@
<aether-version>1.0.2.v20150114</aether-version>
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.7.0.Alpha10</arquillian-version>
- <asciidoctorj-version>2.5.5</asciidoctorj-version>
<avro-version>1.11.0</avro-version>
<glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
<groovy-version>4.0.12</groovy-version>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
index e062dd90b9f..acb2f943c95 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
+++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
@@ -142,13 +142,6 @@
<version>${gson-version}</version>
</dependency>
- <!-- asciidoc to convert adoc to html files -->
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>${asciidoctorj-version}</version>
- </dependency>
-
<!-- roaster to create java source for Spring Boot auto configuration support -->
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
[camel-spring-boot] 03/04: Migrate to SB3
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-spring-boot.git
commit d8e0ac63c326e7cf495078a1bf7b1b4606bdec0b
Author: Claus Ibsen <cl...@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>
[camel-spring-boot] 02/04: Remove not in use
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-spring-boot.git
commit bf55b1965232ca0793cb384f704bd89692c02cc9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 21:44:08 2023 +0200
Remove not in use
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a5c33f65913..b686df1e0bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,6 @@
<groovy-version>4.0.12</groovy-version>
<jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
<jaxb-version>2.3.0</jaxb-version>
- <jetty9-version>9.4.45.v20220203</jetty9-version>
<maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.0</maven-surefire-plugin-version>