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 <opi...@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>
