You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/01/05 22:35:46 UTC
[camel] branch main updated (e01780a -> 2c1451a)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e01780a Regen for commit f132a2f9ff6e09005f17d588207d97a7a7373caf
new f82e706 CAMEL-17429: removed JDK 9 profiles on the parent module
new aa73966 CAMEL-17429: removed JDK 9 profiles on the camel-core-engine module
new 54d7601 CAMEL-17429: removed JDK 9 profiles on the core/camel-management module
new 9f3f450 CAMEL-17429: removed JDK 9 profiles on the core/camel-management-api module
new 2c1451a CAMEL-17435: jakarta.xml.bind-api is already defined as a dependency in that module
The 5 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:
core/camel-core-engine/pom.xml | 45 ++--------
core/camel-management-api/pom.xml | 44 ++--------
core/camel-management/pom.xml | 42 ++-------
parent/pom.xml | 180 +++++++++++++++-----------------------
4 files changed, 92 insertions(+), 219 deletions(-)
[camel] 03/05: CAMEL-17429: removed JDK 9 profiles on the core/camel-management module
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 54d7601448412f3fc54545dbbb2f2cca2673352b
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:11:36 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the core/camel-management module
---
core/camel-management/pom.xml | 42 +++++++-----------------------------------
1 file changed, 7 insertions(+), 35 deletions(-)
diff --git a/core/camel-management/pom.xml b/core/camel-management/pom.xml
index 6c93f8e..0beb1b2 100644
--- a/core/camel-management/pom.xml
+++ b/core/camel-management/pom.xml
@@ -85,6 +85,13 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -304,40 +311,5 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- </excludes>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
[camel] 04/05: CAMEL-17429: removed JDK 9 profiles on the core/camel-management-api module
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9f3f450fae6a4f6d63d588a59b44c4844a9394b9
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:13:35 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the core/camel-management-api module
---
core/camel-management-api/pom.xml | 44 +++++++--------------------------------
1 file changed, 7 insertions(+), 37 deletions(-)
diff --git a/core/camel-management-api/pom.xml b/core/camel-management-api/pom.xml
index 2a76627..cbca2b0 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -43,6 +43,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
@@ -242,42 +249,5 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
[camel] 05/05: CAMEL-17435: jakarta.xml.bind-api is already defined as a dependency in that module
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c1451aab95bc2ee232e4b20ca27e6ebd613ea62
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Wed Jan 5 06:55:20 2022 -0300
CAMEL-17435: jakarta.xml.bind-api is already defined as a dependency in that module
---
parent/pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f2256e..3eec6ea 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4110,13 +4110,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
[camel] 01/05: CAMEL-17429: removed JDK 9 profiles on the parent module
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f82e70688eedf7589160e0e64450671f22a3f73b
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 17:57:43 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the parent module
---
parent/pom.xml | 187 ++++++++++++++++++++++++---------------------------------
1 file changed, 77 insertions(+), 110 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0cf0ded..2f2256e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
<properties>
<compiler.fork>true</compiler.fork>
- <cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
+ <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs/>
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
<camel.surefire.forkCount>1</camel.surefire.forkCount>
@@ -4040,6 +4040,68 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax-annotation-api-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo-ws-metadata-spec-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.3.28</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!--Get dependency from jaxb-runtime-->
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${glassfish-jaxb-runtime-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
@@ -4048,6 +4110,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
@@ -4063,6 +4132,13 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>${jaxb2-maven-plugin-version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -4885,115 +4961,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin-version}</version>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- <maxmem>512M</maxmem>
- <fork>true</fork>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax-annotation-api-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>${geronimo-ws-metadata-spec-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.28</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- </exclusion>
- <exclusion>
- <!--Get dependency from jaxb-runtime-->
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${glassfish-jaxb-runtime-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- <version>1.4.0</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>tia</id>
<properties>
[camel] 02/05: CAMEL-17429: removed JDK 9 profiles on the camel-core-engine module
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa739667fbc6674baf1ed2cf0033985406c4409c
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:05:50 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-core-engine module
---
core/camel-core-engine/pom.xml | 45 ++++++++----------------------------------
1 file changed, 8 insertions(+), 37 deletions(-)
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 9526243..a69b190 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -47,6 +47,7 @@
javax.xml.bind*;version="[2.2,3.0)",
*
</camel.osgi.import>
+ <platform.skip.tests>false</platform.skip.tests>
</properties>
<dependencies>
@@ -60,6 +61,13 @@
<optional>true</optional>
</dependency>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -349,43 +357,6 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>