You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2023/01/19 17:13:48 UTC
[camel-spring-boot] 01/01: Update to Spring Boot 2.7.8
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch update-spring-boot-2.7.8
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 51c947e70324b9c214e366ee9552b8b9ae8e5139
Author: Gregor Zurowski <gr...@zurowski.net>
AuthorDate: Thu Jan 19 18:13:28 2023 +0100
Update to Spring Boot 2.7.8
---
pom.xml | 158 +++++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 107 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0a799e53ec9..b4d9f23b3ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,22 +2,31 @@
<!--
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.
+ 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
+(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.
+ 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.
+ 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">
+<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>
<parent>
@@ -108,7 +117,7 @@
<compiler.fork>false</compiler.fork>
<!-- Spring-Boot target version -->
- <spring-boot-version>2.7.7</spring-boot-version>
+ <spring-boot-version>2.7.8</spring-boot-version>
<!-- Camel target version -->
<camel-version>3.18.5-SNAPSHOT</camel-version>
@@ -201,7 +210,7 @@
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
+ <artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
</plugin>
-->
@@ -431,7 +440,8 @@
<javax.xml.accessExternalDTD>file,http</javax.xml.accessExternalDTD>
<derby.stream.error.file>target/derby.log</derby.stream.error.file>
<java.awt.headless>${java.awt.headless}</java.awt.headless>
- <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties
+ <java.util.logging.config.file>
+ ${basedir}/target/test-classes/logging.properties
</java.util.logging.config.file>
<org.apache.activemq.default.directory.prefix>target/
</org.apache.activemq.default.directory.prefix>
@@ -475,7 +485,8 @@
<profile>
<id>setup.eclipse</id>
<!-- set up the eclipse workspace and generate the .classpath and .project
- files for modules -->
+ files
+ for modules -->
<properties>
<eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
<maven.test.skip.exec>true</maven.test.skip.exec>
@@ -532,62 +543,106 @@
<path path="${basedir}/etc" id="etc.path" />
<path id="buildtools.classpath">
- <fileset dir="${basedir}/buildingtools/target" includes="*.jar" />
- <pathelement location="${basedir}/buildingtools/target/classes" />
- <pathelement location="${basedir}/buildingtools/src/main/resources" />
+ <fileset dir="${basedir}/buildingtools/target"
+ includes="*.jar" />
+ <pathelement
+ location="${basedir}/buildingtools/target/classes" />
+ <pathelement
+ location="${basedir}/buildingtools/src/main/resources" />
</path>
- <whichresource resource="/camel-eclipse-pmd" property="pmd.url" classpathref="buildtools.classpath" />
- <whichresource resource="/camel-pmd-ruleset.xml" property="pmdruleset.url" classpathref="buildtools.classpath" />
- <whichresource resource="/camel-eclipse-checkstyle" property="eclipse.checkstyle.url" classpathref="buildtools.classpath" />
- <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url" classpathref="buildtools.classpath" />
-
- <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" />
- <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core" />
- <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" />
-
- <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml" />
+ <whichresource resource="/camel-eclipse-pmd"
+ property="pmd.url" classpathref="buildtools.classpath" />
+ <whichresource resource="/camel-pmd-ruleset.xml"
+ property="pmdruleset.url"
+ classpathref="buildtools.classpath" />
+ <whichresource resource="/camel-eclipse-checkstyle"
+ property="eclipse.checkstyle.url"
+ classpathref="buildtools.classpath" />
+ <whichresource resource="/camel-checkstyle.xml"
+ property="checkstyle.url"
+ classpathref="buildtools.classpath" />
+
+ <mkdir
+ dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" />
+ <mkdir
+ dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core" />
+ <mkdir
+ dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" />
+
+ <get src="${checkstyle.url}"
+ dest="${full.eclipse.workspace}/camel-checkstyle.xml" />
<!-- Add checkstyle config -->
- <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="no">
+ <copy
+ file="${basedir}/etc/eclipse/template.checkstyle-config.xml"
+ tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
+ overwrite="no">
<filterset>
- <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/camel-checkstyle.xml" />
- <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" />
+ <filter token="CHECKSTYLE_CONFIG_FILE"
+ value="${full.eclipse.workspace}/camel-checkstyle.xml" />
+ <filter token="APACHE_HEADER_FILE"
+ value="${full.eclipse.workspace}/apache-header.txt" />
</filterset>
</copy>
- <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new">
- <param name="checkstyleconfig" expression="${full.eclipse.workspace}/camel-checkstyle.xml" />
+ <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl"
+ in="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
+ out="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new">
+ <param name="checkstyleconfig"
+ expression="${full.eclipse.workspace}/camel-checkstyle.xml" />
</xslt>
- <copy file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="yes" />
+ <copy
+ file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new"
+ tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
+ overwrite="yes" />
<!-- Add code format rules -->
- <concat destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" append="true" fixlastline="true">
- <filelist dir="${basedir}/etc/eclipse" files="org.eclipse.jdt.core.prefs" />
+ <concat
+ destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"
+ append="true" fixlastline="true">
+ <filelist dir="${basedir}/etc/eclipse"
+ files="org.eclipse.jdt.core.prefs" />
</concat>
- <loadfile property="eclipse.code.format" srcFile="${basedir}/etc/eclipse/CamelCodeFormatter.xml" />
- <loadfile property="eclipse.code.templates" srcFile="${basedir}/etc/eclipse/codetemplates.xml" />
- <loadfile property="eclipse.camel.java.code.templates" srcFile="${basedir}/etc/eclipse/camel_java_templates.xml" />
- <loadfile property="eclipse.camel.xml.code.templates" srcFile="${basedir}/etc/eclipse/camel_xml_templates.xml" />
- <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
- <entry key="formatter_profile" value="Camel Java Conventions" />
- <entry key="org.eclipse.jdt.ui.formatterprofiles" value="${eclipse.code.format}" />
- <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}" />
+ <loadfile property="eclipse.code.format"
+ srcFile="${basedir}/etc/eclipse/CamelCodeFormatter.xml" />
+ <loadfile property="eclipse.code.templates"
+ srcFile="${basedir}/etc/eclipse/codetemplates.xml" />
+ <loadfile property="eclipse.camel.java.code.templates"
+ srcFile="${basedir}/etc/eclipse/camel_java_templates.xml" />
+ <loadfile property="eclipse.camel.xml.code.templates"
+ srcFile="${basedir}/etc/eclipse/camel_xml_templates.xml" />
+ <propertyfile
+ file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
+ <entry key="formatter_profile"
+ value="Camel Java Conventions" />
+ <entry key="org.eclipse.jdt.ui.formatterprofiles"
+ value="${eclipse.code.format}" />
+ <entry
+ key="org.eclipse.jdt.ui.text.custom_code_templates"
+ value="${eclipse.code.templates}" />
<!-- Add Camel templates for Java DSL -->
- <entry key="org.eclipse.jdt.ui.text.custom_templates" value="${eclipse.camel.java.code.templates}" />
+ <entry key="org.eclipse.jdt.ui.text.custom_templates"
+ value="${eclipse.camel.java.code.templates}" />
<!-- Add import order -->
- <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;" />
+ <entry key="org.eclipse.jdt.ui.importorder"
+ value="java;javax;org.w3c;org.xml;w3c;" />
<!-- Sort order -->
- <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
- <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />
- <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true" />
+ <entry key="org.eclipse.jdt.ui.visibility.order"
+ value="B,R,D,V," />
+ <entry key="outlinesortoption"
+ value="T,SF,F,SI,I,C,SM,M," />
+ <entry key="org.eclipse.jdt.ui.enable.visibility.order"
+ value="true" />
</propertyfile>
- <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
+ <propertyfile
+ file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
<entry key="eclipse.preferences.version" value="1" />
<!-- Add Camel templates for Spring DSL -->
- <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.camel.xml.code.templates}" />
+ <entry key="org.eclipse.wst.sse.ui.custom_templates"
+ value="${eclipse.camel.xml.code.templates}" />
</propertyfile>
</target>
</configuration>
@@ -603,7 +658,8 @@
<profile>
<!-- When not on the Mac, we need to add tools.jar to the antrun plugin
- for schemagen to work -->
+ for
+ schemagen to work -->
<id>not-mac</id>
<activation>
<os>
@@ -876,4 +932,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file