You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/07 18:45:40 UTC

[camel] branch master updated: CAMEL-13835: camel-util : cleanup pom (#3087)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new a6a6fea  CAMEL-13835: camel-util : cleanup pom (#3087)
a6a6fea is described below

commit a6a6fea6094b3d9bdf3558275804bfe01ef43efb
Author: Luca Burgazzoli <lb...@users.noreply.github.com>
AuthorDate: Wed Aug 7 20:45:33 2019 +0200

    CAMEL-13835: camel-util : cleanup pom (#3087)
---
 core/camel-util/pom.xml | 71 +++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 49 deletions(-)

diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index b2b8091..4a2f125 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -42,6 +42,13 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <!-- enable the APT processor -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>apt</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- testing -->
         <dependency>
             <groupId>junit</groupId>
@@ -171,6 +178,21 @@
         </plugins>
     </reporting>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- 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>
+
     <profiles>
         <profile>
             <id>release</id>
@@ -256,54 +278,5 @@
                 </plugins>
             </build>
         </profile>
-
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <dependencies>
-                <!-- enable the APT processor -->
-                <dependency>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>apt</artifactId>
-                    <scope>provided</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>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${jakarta-jaxb-version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.glassfish.jaxb</groupId>
-                                <artifactId>jaxb-runtime</artifactId>
-                                <version>${glassfish-jaxb-runtime-version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>