This is an automated email from the ASF dual-hosted git repository. klease pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/main by this push: new 6890a23f Update dependency versions for compatibility with Core Camel. (#128) 6890a23f is described below commit 6890a23f876eff5f4579c70fc65285b1c5616365 Author: klease <38634989+kle...@users.noreply.github.com> AuthorDate: Wed Sep 13 15:35:46 2023 +0200 Update dependency versions for compatibility with Core Camel. (#128) Also fix the dependencies for the spring-security integration test. --- examples/bigxml-split/pom.xml | 2 +- examples/jdbc/pom.xml | 5 +++++ examples/pom.xml | 25 ++++++++++--------------- examples/spring-security/pom.xml | 10 +++++++++- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/examples/bigxml-split/pom.xml b/examples/bigxml-split/pom.xml index 4c15b2eb..815f6f8e 100644 --- a/examples/bigxml-split/pom.xml +++ b/examples/bigxml-split/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> - <version>${woodstox-version}</version> + <version>${woodstox-core-version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml index 8c083936..ad98e557 100644 --- a/examples/jdbc/pom.xml +++ b/examples/jdbc/pom.xml @@ -76,6 +76,11 @@ </dependency> <!-- jdbc --> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby-version}</version> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> diff --git a/examples/pom.xml b/examples/pom.xml index 66bca581..7e8f8ba8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -153,30 +153,26 @@ <camel.version>${project.version}</camel.version> - <activemq-version>5.17.4</activemq-version> <arquillian-version>1.7.0.Alpha10</arquillian-version> - <arquillian-tomcat-version>1.1.0.Final</arquillian-tomcat-version> + <arquillian-tomcat-version>1.2.0.Final</arquillian-tomcat-version> <arquillian-jetty-version>1.0.0.CR4</arquillian-jetty-version> <asciidoctorj-version>2.1.0</asciidoctorj-version> <cdi-api-1.2-version>1.2</cdi-api-1.2-version> - <glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version> <groovy-version>3.0.2</groovy-version> <pax-exam-version>4.13.2</pax-exam-version> <pax-url-aether>2.6.2</pax-url-aether> <jaxb-version>2.3.0</jaxb-version> - <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version> - <maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version> - <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version> - <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version> + <!-- These are not inherited from Camel via camel-dependencies --> + <maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version> + <maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version> + <maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version> + <maven-release-plugin-version>3.0.1</maven-release-plugin-version> + <flatten-maven-plugin-version>1.5.0</flatten-maven-plugin-version> <metrics-cdi-version>1.3.3</metrics-cdi-version> <mycila-license-version>3.0</mycila-license-version> <pax-cdi-version>1.0.0</pax-cdi-version> - <spring-security-version>5.3.0.RELEASE</spring-security-version> <surefire.version>${maven-surefire-plugin-version}</surefire.version> - <tomcat-version>9.0.56</tomcat-version> - <woodstox-version>6.0.3</woodstox-version> - <xmlunit-version>1.6</xmlunit-version> - <derby-version>10.14.2.0</derby-version> + <tomcat-version>10.1.13</tomcat-version> <jkube-version>1.14.0</jkube-version> <wsdl4j-version>1.6.3</wsdl4j-version> <fabric8-maven-plugin-version>4.4.1</fabric8-maven-plugin-version> @@ -409,8 +405,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <!-- see https://issues.apache.org/jira/browse/MRELEASE-812 --> - <version>2.4.2</version> + <version>${maven-release-plugin-version}</version> <dependencies> <dependency> <groupId>org.apache.maven.scm</groupId> @@ -445,7 +440,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> - <version>1.1.0</version> + <version>${flatten-maven-plugin-version}</version> <executions> <execution> <id>default-cli</id> diff --git a/examples/spring-security/pom.xml b/examples/spring-security/pom.xml index c8828e0d..fd5ec8d8 100644 --- a/examples/spring-security/pom.xml +++ b/examples/spring-security/pom.xml @@ -94,7 +94,7 @@ <!-- Test dependencies BEGIN --> <dependency> <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-tomcat-embedded-9</artifactId> + <artifactId>arquillian-tomcat-embedded-10</artifactId> <version>${arquillian-tomcat-version}</version> <scope>test</scope> </dependency> @@ -122,6 +122,14 @@ <version>${rest-assured-version}</version> <scope>test</scope> </dependency> + +<dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${jakarta-servlet-api-version}</version> + <scope>test</scope> +</dependency> + <!-- Test dependencies END --> </dependencies>