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-10455: Fixed camel-chronoicle to use JARs that dont dependt on SNAPSHOT
Date Tue, 08 Nov 2016 16:05:25 GMT
CAMEL-10455: Fixed camel-chronoicle to use JARs that dont dependt on SNAPSHOT


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

Branch: refs/heads/camel-2.18.x
Commit: 486ed7d7caa27bcaf6b31e14a1a5f31125113fad
Parents: df85aa5
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Nov 8 17:04:30 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Nov 8 17:05:12 2016 +0100

----------------------------------------------------------------------
 components/camel-chronicle/pom.xml | 17 +++++++++++++++--
 parent/pom.xml                     |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/486ed7d7/components/camel-chronicle/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/pom.xml b/components/camel-chronicle/pom.xml
index ec0dab5..6be5006 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -15,7 +15,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -43,10 +44,22 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
+    <!-- need to override maven version as some releases are dody and refer to SNAPSHOT
-->
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>chronicle-wire</artifactId>
+      <version>${chronicle-wire-version}</version>
+    </dependency>
     <dependency>
       <groupId>net.openhft</groupId>
       <artifactId>chronicle-engine</artifactId>
       <version>${chronicle-engine-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.openhft</groupId>
+          <artifactId>chronicle-wire</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -84,7 +97,7 @@
       <artifactId>java-hamcrest</artifactId>
       <version>${hamcrest-version}</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
   </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/486ed7d7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8feb96a..1ddb046 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
     <chronicle-core-version>1.7.6</chronicle-core-version>
     <chronicle-engine-version>1.13.10</chronicle-engine-version>
     <chronicle-map-version>2.4.15</chronicle-map-version>
-    <chronicle-network-version>1.7.2</chronicle-network-version>
+    <chronicle-network-version>1.7.3</chronicle-network-version>
     <chronicle-queue-version>4.5.15</chronicle-queue-version>
     <chronicle-threads-version>1.7.2</chronicle-threads-version>
     <chronicle-wire-version>1.7.14</chronicle-wire-version>


Mime
View raw message