You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2016/09/09 17:36:06 UTC

svn commit: r1760091 - in /uima/uima-as/trunk: uima-as-parent/pom.xml uimaj-as-activemq/pom.xml

Author: cwiklik
Date: Fri Sep  9 17:36:06 2016
New Revision: 1760091

URL: http://svn.apache.org/viewvc?rev=1760091&view=rev
Log:
UIMA-5105 added dependency on new junit 4.8.1 and updated surefire plugin to run junit tests

Modified:
    uima/uima-as/trunk/uima-as-parent/pom.xml
    uima/uima-as/trunk/uimaj-as-activemq/pom.xml

Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1760091&r1=1760090&r2=1760091&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Fri Sep  9 17:36:06 2016
@@ -155,6 +155,8 @@
 		<http.core.version>4.4.4</http.core.version>
 		
         <hawtbuff.version>1.11</hawtbuff.version>		
+        
+        <junit.version>4.8.1</junit.version>
 		
         <!-- Needed for NOTICE file packaged in each jar under META-INF -->
 		<uimaASNoticeText>
@@ -203,7 +205,9 @@ ${uimaASNoticeText}
 				<version>${org.apache.activemq.version}</version>
 			</dependency>
 
-			<dependency>
+
+
+      	    <dependency>
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>activemq-jaas</artifactId>
 				<version>${org.apache.activemq.version}</version>
@@ -462,6 +466,12 @@ ${uimaASNoticeText}
           <artifactId>httpcore</artifactId>
           <version>${http.core.version}</version>
         </dependency>
+
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>${junit.version}</version>
+        </dependency>
           
 		</dependencies>
 	</dependencyManagement>

Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1760091&r1=1760090&r2=1760091&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Fri Sep  9 17:36:06 2016
@@ -268,6 +268,10 @@
                <groupId>org.apache.httpcomponents</groupId>
                <artifactId>httpcore</artifactId>
         </dependency>
+        <dependency>
+    <groupId>junit</groupId>
+    <artifactId>junit</artifactId>
+</dependency>
 	</dependencies>
 	<build>
 		<finalName>${project.artifactId}</finalName>
@@ -313,28 +317,40 @@
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<version>2.7.2</version>
+						<!-- artifactId>maven-failsafe-plugin</artifactId>
+						<version>2.7.2</version-->
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>2.10</version>
 						<executions>
 							<execution>
-								<id>integration-test</id>
+								<!-- >id>integration-test</id-->
+								<id>surefire-integration</id>
 								<goals>
-									<goal>integration-test</goal>
+									<!-- goal>integration-test</goal-->
+									<goal>test</goal>
 								</goals>
 							</execution>
-							<execution>
+							<!-- >execution>
 								<id>verify</id>
 								<goals>
 									<goal>verify</goal>
 								</goals>
-							</execution>
+							</execution-->
 						</executions>
 						<configuration>
-							<argLine>-Xmx1024M -XX:MaxPermSize=128m</argLine>
+						<runOrder>alphabetical</runOrder>
+							<argLine>-Xmx1024M -XX:MaxPermSize=128m  "-Dlog4j.configuration=${UIMA_HOME}/apache-activemq/conf/log4j.properties" "-Djava.util.logging.config.file=${UIMA_HOME}/config/Logger.properties"</argLine>
 							<encoding>UTF-8</encoding>
 							<includes>
 								<include>**/TestUimaASExtended.java</include>
 							</includes>
+							<forkMode>once</forkMode>
+							<properties>
+            <!-- property>
+                <name>listener</name>
+                <value>org.apache.uima.ee.test.utils.UimaASJunitTestFailFastListener</value>
+            </property-->
+        </properties>
 						</configuration>
 					</plugin>
 				</plugins>