anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
selva.andre
2014-09-09 17:39:35 +02:00
parent bae1987704 b792e3695d
commit c624c040b7
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/pom.xml
+37 -36
View File
@@ -121,11 +121,11 @@
</dependency>
<dependency>
<groupId>org.kaazing</groupId>
<artifactId>robot.junit</artifactId>
<version>0.0.0.12</version>
<scope>test</scope>
</dependency>
<groupId>org.kaazing</groupId>
<artifactId>robot.junit</artifactId>
<version>0.0.0.12</version>
<scope>test</scope>
</dependency>
<!-- needs extra dependencies: objenesis & hamcrest -->
<dependency>
@@ -178,38 +178,39 @@
</configuration>
</plugin>
<plugin>
<groupId>org.kaazing</groupId>
<artifactId>robot-maven-plugin</artifactId>
<version>0.0.0.12</version>
<configuration>
<skipTests>${skipITs}</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<configuration>
<skipTests>${skipITs}</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.kaazing</groupId>
<artifactId>robot-maven-plugin</artifactId>
<version>0.0.0.12</version>
<configuration>
<skipTests>${skipITs}</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<configuration>
<skipTests>${skipITs}</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>