zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin-brave-karaf] 26/37: Fix type and update to karaf 4.2.0
Date Wed, 30 Jan 2019 14:19:11 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch rat
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git

commit ead68b7516d339a6a7a831b70e419c2635178db0
Author: Christian Schneider <cschneid@adobe.com>
AuthorDate: Wed Aug 1 11:26:51 2018 +0200

    Fix type and update to karaf 4.2.0
---
 .gitignore                                                 | 5 +++++
 features/src/main/resources/features.xml                   | 8 ++++----
 itests/src/test/java/io/zipkin/brave/itests/BraveTest.java | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1f45e2..fb3a2f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,8 @@ target/
 
 # macOS
 .DS_Store
+
+# Eclipse
+.classpath
+.project
+.settings/
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 72377d7..b8a827a 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -21,13 +21,13 @@
 	<feature name="brave">
 		<feature>scr</feature>
 		<bundle dependency="true">mvn:io.zipkin.zipkin2/zipkin/${zipkin.version}</bundle>
-		<bundle dependency="true">mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin.reporter.version}</bundle>
-		<bundle>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin.reporter.version}</bundle>
+		<bundle dependency="true">mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin-reporter.version}</bundle>
+		<bundle>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter.version}</bundle>
 		<bundle>mvn:io.zipkin.brave/brave/${brave.version}</bundle>
 		<bundle>mvn:io.zipkin.brave/brave-instrumentation-http/${brave.version}</bundle>
 		<bundle>mvn:io.zipkin.brave.karaf/brave-exporter/${project.version}</bundle>
 	</feature>
-	
+
 	<feature name="brave-sender-kafka">
 		<feature>brave</feature>
 		<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/1.1.0_1</bundle>
@@ -41,4 +41,4 @@
 		<bundle>mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin.reporter.version}</bundle>
 		<bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version}</bundle>
 	</feature>
-</features>
\ No newline at end of file
+</features>
diff --git a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
index 6698d4e..6552801 100644
--- a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
+++ b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
@@ -53,7 +53,7 @@ public class BraveTest {
   @Configuration
   public static Option[] configuration() {
     MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
-        .type("zip").version("4.0.7");
+        .type("zip").version("4.2.0");
     MavenUrlReference brave =
         maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml")
             .classifier("features").version("0.1.0-SNAPSHOT");


Mime
View raw message