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 09:58:15 UTC
[camel] branch main updated (c50bff7 -> 415b514)
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 c50bff7 Upgrade AWS SDK v2 to version 2.17.104
new 3a9cbfa CAMEL-17429: removed JDK 9 profiles on the camel-cdi component
new 6a3ef11 CAMEL-17429: removed JDK 9 profiles on the camel-jmx component
new 7f3a36f CAMEL-17429: removed JDK 9 profiles on the camel-kubernetes component
new e09fc20 CAMEL-17429: removed JDK 9 profiles on the camel-soap component
new 415b514 CAMEL-17429: removed JDK 9 profiles on the camel-jpa component
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:
components/camel-cdi/pom.xml | 152 ++++++++++++++++--------------------
components/camel-jmx/pom.xml | 96 ++++++++---------------
components/camel-jpa/pom.xml | 106 ++++++++++++-------------
components/camel-kubernetes/pom.xml | 43 ++++------
components/camel-soap/pom.xml | 107 +++++++++----------------
5 files changed, 204 insertions(+), 300 deletions(-)
[camel] 05/05: CAMEL-17429: removed JDK 9 profiles on the camel-jpa component
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 415b514ee994a021618aae4c75c8f89e1129eab7
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 19:51:13 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-jpa component
---
components/camel-jpa/pom.xml | 106 ++++++++++++++++++++-----------------------
1 file changed, 50 insertions(+), 56 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 3473315..7e7b4ef 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -107,8 +107,58 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa-version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar
+ ${camel.surefire.fork.vmargs}
+ </argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>openjpa</id>
@@ -227,61 +277,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa-version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar
- ${camel.surefire.fork.vmargs}
- </argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
[camel] 02/05: CAMEL-17429: removed JDK 9 profiles on the camel-jmx component
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 6a3ef111cece65f2b36b4b4dad01e934fd2c9ab0
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:41:33 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-jmx component
---
components/camel-jmx/pom.xml | 96 +++++++++++++++-----------------------------
1 file changed, 33 insertions(+), 63 deletions(-)
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 8383870..c060581 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -101,70 +101,40 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${cxf-xjc-plugin-version}</version>
+ <configuration>
+ <extensions>
+ <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
+ </extensions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
<configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
+ <sourceRoot>${basedir}/target/xjc</sourceRoot>
+ <xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
+ <packagename>org.apache.camel.component.jmx.jaxb</packagename>
+ <extensionArgs>
+ <extensionArg>-Xfluent-api</extensionArg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
</configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
- <packagename>org.apache.camel.component.jmx.jaxb</packagename>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[camel] 01/05: CAMEL-17429: removed JDK 9 profiles on the camel-cdi component
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 3a9cbfae10c07332a8788153def2f806799cf024
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:41:25 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-cdi component
---
components/camel-cdi/pom.xml | 152 ++++++++++++++++++++-----------------------
1 file changed, 69 insertions(+), 83 deletions(-)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 0e992c2..8c5dd8a 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -93,7 +93,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
+
</dependencies>
</dependencyManagement>
<dependencies>
@@ -221,6 +221,31 @@
<scope>test</scope>
</dependency>
+
+ <!-- provided dependencies -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi-api-2.0-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- test dependencies -->
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-impl</artifactId>
+ <version>${weld3-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <version>${arquillian-weld-embedded-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -257,6 +282,49 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>copy-jaxb</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.basedir}/target/java9</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${glassfish-jaxb-runtime-version}</version>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.basedir}/target/java9</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -446,87 +514,5 @@
</dependencies>
</profile>
-
- <profile>
- <id>jdk9s-weld-3.0</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-impl</artifactId>
- <version>${weld3-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian-weld-embedded-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy-jaxb</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${glassfish-jaxb-runtime-version}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
[camel] 04/05: CAMEL-17429: removed JDK 9 profiles on the camel-soap component
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 e09fc20db6bc5cc1c585e72d9dca4905d1b11e48
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:53:23 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-soap component
---
components/camel-soap/pom.xml | 107 ++++++++++++++----------------------------
1 file changed, 35 insertions(+), 72 deletions(-)
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index bf1e82b..e45b441 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -137,6 +137,41 @@
</xsdOptions>
</configuration>
</execution>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
+ <sourceRoot>${basedir}/target/xjc</sourceRoot>
+ <extensions>
+ <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
+ </extensions>
+ <xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
+ <extensionArgs>
+ <extensionArg>-Xfluent-api</extensionArg>
+ </extensionArgs>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
+ <extensionArgs>
+ <extensionArg>-Xfluent-api</extensionArg>
+ </extensionArgs>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
+ <extensionArgs>
+ <extensionArg>-Xfluent-api</extensionArg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -199,78 +234,6 @@
<profiles>
<profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>jdk17-build</id>
<activation>
<jdk>[17,)</jdk>
[camel] 03/05: CAMEL-17429: removed JDK 9 profiles on the camel-kubernetes component
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 7f3a36ffb04960db7e8ae02c4eb00e80545a9b15
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Jan 4 18:44:15 2022 +0100
CAMEL-17429: removed JDK 9 profiles on the camel-kubernetes component
---
components/camel-kubernetes/pom.xml | 43 +++++++++++++++----------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index df98647..53a8289 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -34,6 +34,23 @@
<properties>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <version>${mockwebserver-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -129,31 +146,5 @@
<version>${squareup-okhttp-version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk9s-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>${mockwebserver-version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>