camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-8061: Need to use fixed version of felix fileinstall for pojosr due to bug in pojosr/fileinstall that otherwise causes CPU to spike.
Date Tue, 18 Nov 2014 14:54:08 GMT
CAMEL-8061: Need to use fixed version of felix fileinstall for pojosr due to bug in pojosr/fileinstall
that otherwise causes CPU to spike.

Conflicts:
	components/camel-test-blueprint/pom.xml


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

Branch: refs/heads/camel-2.14.x
Commit: a57656054161a1e6e0d2bef3751d4e931d93d92b
Parents: b552691
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Nov 18 15:52:24 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Nov 18 15:53:25 2014 +0100

----------------------------------------------------------------------
 components/camel-test-blueprint/pom.xml | 7 +++++--
 parent/pom.xml                          | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a5765605/components/camel-test-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 02f91b1..b8ea855 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>${felix-fileinstall-version}</version>
+            <version>${felix-fileinstall-pojosr-version}</version>
                 <!-- exclude the following dependency which otherwise would pop up a lot
of compilation
                      errors both by this and the camel-maven-plugin modules under eclipse.
-->
                 <exclusions>
@@ -161,14 +161,17 @@
         </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>pertest</forkMode>
+            		<forkCount>1</forkCount>
+   	    		    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+    
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/a5765605/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b27c5d..8dc8bfb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,6 +138,8 @@
     <fastinfoset-version>1.2.13_1</fastinfoset-version>
     <felix-configadmin-version>1.4.0</felix-configadmin-version>
     <felix-fileinstall-version>3.2.6</felix-fileinstall-version>
+    <!-- need to keep using the older 3.2.8 that do not cause NPE issues when using pojosr
- see pojosr bug #13 -->
+    <felix-fileinstall-pojosr-version>3.2.8</felix-fileinstall-pojosr-version>
     <felix-framework-version>3.2.2</felix-framework-version>
     <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
     <flatpack-version>3.4.2</flatpack-version>


Mime
View raw message