Fixing feature uri and logging

openzipkin · Dec 9, 2016 · 49ea3de · 49ea3de
1 parent af6ca7a
commit 49ea3de
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ hs_err_pid*
 
 .project
 .settings
+target
diff --git a/brave-features/target/classes/features.xml b/brave-features/target/classes/features.xml
diff --git a/brave-itests/pom.xml b/brave-itests/pom.xml
@@ -24,7 +24,6 @@
         <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>brave-itests</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
 
 	<properties>
 		<pax.exam.version>4.5.0</pax.exam.version>

diff --git a/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
@@ -49,8 +49,8 @@ public class BraveTest {
     public static Option[] configuration() throws Exception {
         MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
             .type("zip").version("4.0.7");
-        MavenUrlReference brave = maven().groupId("net.lr.brave.osgi").artifactId("brave-features").type("xml")
-           .classifier("features").version("0.0.1-SNAPSHOT");
+        MavenUrlReference brave = maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml")
+           .classifier("features").version("1.0.0-SNAPSHOT");
         return new Option[] //
         {
          karafDistributionConfiguration().frameworkUrl(karaf).useDeployFolder(false),

diff --git a/brave-itests/src/test/resources/logback.xml b/brave-itests/src/test/resources/logback.xml
@@ -8,17 +8,8 @@
         </encoder>
     </appender>
 
-  <!--  log to file test.log  -->
-    <appender name="TEST_LOG" class="ch.qos.logback.core.FileAppender">
-        <file>test.log</file>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
     <root level="INFO">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="TEST_LOG" />
     </root>
     <logger name="org.ops4j.pax.exam" level="INFO" />
 

diff --git a/brave-itests/test.log b/brave-itests/test.log
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 
     <brave.version>3.16.0</brave.version>
     <zipkin.version>1.16.0</zipkin.version>
-    <zipkin-reporter.version>0.6.7</zipkin-reporter.version>
+    <zipkin.reporter.version>0.6.7</zipkin.reporter.version>
 
     <slf4j.version>1.7.21</slf4j.version>
   </properties>
@@ -100,7 +100,7 @@
       <dependency>
         <groupId>io.zipkin.reporter</groupId>
         <artifactId>zipkin-reporter</artifactId>
-        <version>${zipkin-reporter.version}</version>
+        <version>${zipkin.reporter.version}</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ hs_err_pid*

		.project
		.settings
		target