You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by al...@apache.org on 2017/11/19 18:03:04 UTC
svn commit: r1815753 - in /ctakes/trunk: .gitattributes
ctakes-clinical-pipeline/pom.xml ctakes-examples/pom.xml pom.xml
Author: alexz
Date: Sun Nov 19 18:03:04 2017
New Revision: 1815753
URL: http://svn.apache.org/viewvc?rev=1815753&view=rev
Log:
CTAKES-481: fix exec-maven-plugin - use default parent pom for default configuration
Modified:
ctakes/trunk/.gitattributes
ctakes/trunk/ctakes-clinical-pipeline/pom.xml
ctakes/trunk/ctakes-examples/pom.xml
ctakes/trunk/pom.xml
Modified: ctakes/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/ctakes/trunk/.gitattributes?rev=1815753&r1=1815752&r2=1815753&view=diff
==============================================================================
--- ctakes/trunk/.gitattributes (original)
+++ ctakes/trunk/.gitattributes Sun Nov 19 18:03:04 2017
@@ -10,7 +10,7 @@
*.pm text diff=perl eol=lf
# *.css text eol=lf
*.js text eol=lf
-*.sql text eol=lf
+# *.sql text eol=lf
*.sh text eol=lf
Modified: ctakes/trunk/ctakes-clinical-pipeline/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-clinical-pipeline/pom.xml?rev=1815753&r1=1815752&r2=1815753&view=diff
==============================================================================
--- ctakes/trunk/ctakes-clinical-pipeline/pom.xml (original)
+++ ctakes/trunk/ctakes-clinical-pipeline/pom.xml Sun Nov 19 18:03:04 2017
@@ -65,19 +65,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- <executions>
- <execution>
- <!-- depends on other modules being on classpath -->
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
<configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
<mainClass>org.apache.uima.tools.cpm.CpmFrame</mainClass>
<arguments>
<argument />
@@ -108,20 +96,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- <executions>
- <execution>
- <!-- depends on other modules being on classpath -->
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
<configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
-
<mainClass>org.apache.uima.tools.cvd.CVD</mainClass>
<!-- Have to specify at least one parameter otherwise, CVD thinks
it's an invalid param because MVN passes null when joining to the mvn thread -->
Modified: ctakes/trunk/ctakes-examples/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-examples/pom.xml?rev=1815753&r1=1815752&r2=1815753&view=diff
==============================================================================
--- ctakes/trunk/ctakes-examples/pom.xml (original)
+++ ctakes/trunk/ctakes-examples/pom.xml Sun Nov 19 18:03:04 2017
@@ -70,20 +70,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
- <!-- depends on other modules being on classpath -->
- <phase>compile</phase>
<goals>
- <goal>exec</goal>
+ <goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
- <executable>java</executable>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
<workingDirectory>${project.parent.basedir}</workingDirectory>
<arguments>
<argument>-classpath</argument>
Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1815753&r1=1815752&r2=1815753&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Sun Nov 19 18:03:04 2017
@@ -956,6 +956,25 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <!-- exec-maven-plugin -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>