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:17 UTC
[camel] 02/05: CAMEL-17429: removed JDK 9 profiles on the camel-jmx 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 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>