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] branch master updated: Moves integration test to integration test phase (#28)
Date Sun, 10 Feb 2019 13:42:58 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 0e0166e  Moves integration test to integration test phase (#28)
0e0166e is described below

commit 0e0166e7aa38fe9d92a7098bc5e63f3536f7f405
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Sun Feb 10 14:42:54 2019 +0100

    Moves integration test to integration test phase (#28)
    
    Common building and packaging shouldn't require execution of integration
    tests. This renames the file so that it isn't executed when doing
    `./mvnw package`
    
    Thanks @shakuzen for the suggestion!
---
 itests/pom.xml                                       | 11 +++++++++++
 .../brave/itests/{BraveTest.java => ITBrave.java}    |  6 +++---
 pom.xml                                              | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/itests/pom.xml b/itests/pom.xml
index 356b6d6..cdb61da 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -169,6 +169,17 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
similarity index 96%
rename from itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
rename to itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
index 456649a..3d93496 100644
--- a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
+++ b/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
@@ -47,7 +47,7 @@ import zipkin2.reporter.Sender;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class BraveTest {
+public class ITBrave {
   private static final String FILTER_KAFKA = "(component.name=io.zipkin.sender.kafka)";
   private static final String FILTER_OKHTTP = "(component.name=io.zipkin.sender.okhttp)";
   private static final String FILTER_URLCONNECTION =
@@ -117,7 +117,7 @@ public class BraveTest {
 
   static String getVersionFromMaven(String path) throws Exception {
     InputStream is =
-        BraveTest.class.getResourceAsStream("/META-INF/maven/" + path + "/pom.properties");
+        ITBrave.class.getResourceAsStream("/META-INF/maven/" + path + "/pom.properties");
     Assert.assertNotNull(is);
     Properties p = new Properties();
     p.load(is);
@@ -125,7 +125,7 @@ public class BraveTest {
   }
 
   static String getBraveKarafVersion() throws Exception {
-    InputStream is = BraveTest.class.getResourceAsStream("/exam.properties");
+    InputStream is = ITBrave.class.getResourceAsStream("/exam.properties");
     Assert.assertNotNull(is);
     Properties p = new Properties();
     p.load(is);
diff --git a/pom.xml b/pom.xml
index 2a728d4..c57ae0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <zipkin-reporter.version>2.7.10</zipkin-reporter.version>
 
     <license-maven-plugin.version>2.11</license-maven-plugin.version>
-    <maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
+    <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
   </properties>
 
   <name>Brave Karaf (Parent)</name>
@@ -247,6 +247,15 @@
             </execution>
           </executions>
         </plugin>
+
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-failsafe-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${maven-failsafe-plugin.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -288,15 +297,6 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-      </plugin>
-
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <version>1.17</version>


Mime
View raw message