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:19 UTC
[camel] 04/05: CAMEL-17429: removed JDK 9 profiles on the camel-soap component
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>