camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [1/2] git commit: Full build with fastinstall works with JDK8 (camel-jibx issue with tests)
Date Fri, 12 Sep 2014 10:20:02 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x beed4cba6 -> 7bbfd3585
  refs/heads/master 595599745 -> d10985069


Full build with fastinstall works with JDK8 (camel-jibx issue with tests)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1098506
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1098506
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1098506

Branch: refs/heads/master
Commit: d109850699e1383a76d4bddaa560077a0662de4e
Parents: 5955997
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
Authored: Fri Sep 12 12:18:42 2014 +0200
Committer: Grzegorz Grzybek <gr.grzybek@gmail.com>
Committed: Fri Sep 12 12:18:42 2014 +0200

----------------------------------------------------------------------
 components/camel-jibx/pom.xml                   | 17 +++++++++++++++
 components/pom.xml                              | 23 ++------------------
 .../features/src/main/resources/features.xml    |  1 +
 3 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d1098506/components/camel-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index a25138b..30b3ec1 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -73,6 +73,7 @@
                 <property>
                     <name>!maven.test.skip</name>
                 </property>
+                <jdk>!1.8</jdk>
             </activation>
             <build>
                 <pluginManagement>
@@ -126,6 +127,22 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk8-test</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>true</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/d1098506/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index ca64be5..a9314d9 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -116,6 +116,8 @@
     <module>camel-jcr</module>
     <module>camel-jdbc</module>
     <module>camel-jgroups</module>
+    <!-- camel-jibx doesn't work under JDK8, but may be build without tests -->
+    <module>camel-jibx</module>
     <module>camel-jing</module>
     <module>camel-jmx</module>
     <module>camel-josql</module>
@@ -271,27 +273,6 @@
   </reporting>
 
   <profiles>
-
-    <!-- Some components don't support Java 8 Yet. -->
-    <profile>
-      <id>jdk-7</id>
-      <modules>
-        <module>camel-jibx</module>
-      </modules>
-      <activation>
-        <jdk>1.7</jdk>
-      </activation>
-    </profile>
-    <profile>
-      <id>jdk-6</id>
-      <modules>
-        <module>camel-jibx</module>
-      </modules>
-      <activation>
-        <jdk>1.6</jdk>
-      </activation>
-    </profile>
-
     <!-- enables the APT dependency so that it can be disabled in IDE builds -->
     <profile>
       <id>apt</id>

http://git-wip-us.apache.org/repos/asf/camel/blob/d1098506/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 582d1df..8da8c6c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -677,6 +677,7 @@
     <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
   </feature>
   <feature name='camel-jibx' version='${project.version}' resolver='(obr)' start-level='50'>
+    <!-- this feature doesn't work under JDK8 -->
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jibx/${project.version}</bundle>
     <bundle dependency='true'>mvn:org.jibx/jibx-run/${jibx-version}</bundle>


Mime
View raw message