You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2013/06/12 17:30:53 UTC

svn commit: r1492240 - in /uima/uimaj/trunk/jcasgen-maven-plugin: pom.xml src/it/m2e/pom.xml

Author: schor
Date: Wed Jun 12 15:30:53 2013
New Revision: 1492240

URL: http://svn.apache.org/r1492240
Log:
[UIMA-2987] disable m2e test in a manner where it's easy to re-enable

Modified:
    uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/m2e/pom.xml

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml?rev=1492240&r1=1492239&r2=1492240&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml Wed Jun 12 15:30:53 2013
@@ -88,6 +88,9 @@
 						<goal>package</goal>
 						<goal>integration-test</goal>
 					</goals>
+					<!-- change this next line by toggling the "!" character to include / exclude the long-running m2e test
+					     It is normally excluded -->
+					<invokerTest>classpath,multimodule,simple,!m2e</invokerTest>
 				</configuration>
 				<executions>
 					<execution>

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/it/m2e/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/m2e/pom.xml?rev=1492240&r1=1492239&r2=1492240&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/m2e/pom.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/m2e/pom.xml Wed Jun 12 15:30:53 2013
@@ -24,8 +24,7 @@
 	<groupId>org.apache.uima</groupId>
 	<artifactId>org.apache.uima.tools.jcasgen.maven.tests.m2e</artifactId>
 	<version>0.9.2-SNAPSHOT</version>
-	<!-- this is disabled, to re-enable switch the packaging by uncommenting the next line -->
-<!-- 	<packaging>eclipse-test-plugin</packaging> -->
+	<packaging>eclipse-test-plugin</packaging>
 	<name>JCasGen Maven plugin Eclipse tests</name>
 	<description>The tests for the JCasGen Maven plugin when used in Eclipse</description>
 	<repositories>
@@ -47,54 +46,53 @@
 	</properties>
 	<build>
 		<plugins>
-		<!-- Note: This build is disabled.  To enable, just reverse the comments (Eclipse has a control-shift-c to do this on multi-lines) -->
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.eclipse.tycho</groupId> -->
-<!-- 				<artifactId>tycho-maven-plugin</artifactId> -->
-<!-- 				<version>${tycho-version}</version> -->
-<!-- 				<extensions>true</extensions> -->
-<!-- 			</plugin> -->
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.eclipse.tycho</groupId> -->
-<!-- 				<artifactId>target-platform-configuration</artifactId> -->
-<!-- 				<version>${tycho-version}</version> -->
-<!-- 				<configuration> -->
-<!-- 					<resolver>p2</resolver> -->
-<!-- 					<ignoreTychoRepositories>true</ignoreTychoRepositories> -->
-<!-- 				</configuration> -->
-<!-- 			</plugin> -->
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-antrun-plugin</artifactId> -->
-<!-- 				<version>1.7</version> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>copy-projects</id> -->
-<!-- 						<phase>generate-test-resources</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>run</goal> -->
-<!-- 						</goals> -->
-<!-- 						<inherited>false</inherited> -->
-<!-- 						<configuration> -->
-<!-- 							<target> -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<resolver>p2</resolver>
+					<ignoreTychoRepositories>true</ignoreTychoRepositories>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>copy-projects</id>
+						<phase>generate-test-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<inherited>false</inherited>
+						<configuration>
+							<target>
 								<!-- Propagate the versions of the UIMA framework into the m2e tests -->
-<!-- 								<copy todir="${project.build.directory}/projects" verbose="yes" overwrite="yes"> -->
-<!-- 									<fileset dir="projects" /> -->
-<!-- 									<filterset> -->
-<!-- 										<filter token="project.version" value="${main.project.version}" /> -->
-<!-- 									</filterset> -->
-<!-- 								</copy> -->
+								<copy todir="${project.build.directory}/projects" verbose="yes" overwrite="yes">
+									<fileset dir="projects" />
+									<filterset>
+										<filter token="project.version" value="${main.project.version}" />
+									</filterset>
+								</copy>
 								<!-- Propagate the jcasgen-maven-plugin artifact being built into the m2e tests -->
-<!-- 								<copy file="settings-template.xml" tofile="${project.build.directory}/../settings.xml" verbose="yes" overwrite="yes"> -->
-<!-- 									<filterset> -->
-<!-- 										<filter token="localRepositoryUrl" value="${main.localRepositoryUrl}" /> -->
-<!-- 									</filterset> -->
-<!-- 								</copy> -->
-<!-- 							</target> -->
-<!-- 						</configuration> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
+								<copy file="settings-template.xml" tofile="${project.build.directory}/../settings.xml" verbose="yes" overwrite="yes">
+									<filterset>
+										<filter token="localRepositoryUrl" value="${main.localRepositoryUrl}" />
+									</filterset>
+								</copy>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>