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 2010/05/18 14:12:21 UTC
svn commit: r945609 - in /uima/build/trunk/parent-poms:
parent-pom-single-project/pom.xml parent-pom-top/pom.xml
Author: schor
Date: Tue May 18 12:12:20 2010
New Revision: 945609
URL: http://svn.apache.org/viewvc?rev=945609&view=rev
Log:
[UIMA-1756] add configuation to javadoc plugin so it kno0ws about common tags. Fix Apache common pom v7 to use multi-module source building, and to run the source plugin without forking
Modified:
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml?rev=945609&r1=945608&r2=945609&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Tue May 18 12:12:20 2010
@@ -103,7 +103,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>binary-release</id>
+ <id>binary-release</id> <!-- is "classifier" - match maven convention -->
<goals><goal>single</goal></goals>
<phase>pre-integration-test</phase> <!-- after package, after jar & docbkx built -->
<configuration>
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=945609&r1=945608&r2=945609&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue May 18 12:12:20 2010
@@ -272,6 +272,61 @@
<source>5</source> <!-- needed to do Enums -->
<encoding>UTF-8</encoding>
</configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <quiet>true</quiet>
+ <!-- identify tags we use so we don't get warning messages for them -->
+ <tags>
+ <tag>
+ <name>generated</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>ordered</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>modifiable</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>model</name>
+ <placement>X</placement>
+ </tag>
+ </tags>
+ </configuration>
+ </execution>
+ <execution>
+ <id>javadocs-distr</id>
+ <configuration>
+ <quiet>true</quiet>
+ <!-- identify tags we use so we don't get warning messages for them -->
+ <tags>
+ <tag>
+ <name>generated</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>ordered</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>modifiable</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>model</name>
+ <placement>X</placement>
+ </tag>
+ </tags>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -363,7 +418,7 @@
<phase>verify</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
@@ -436,5 +491,46 @@
</plugins>
</build>
</profile>
+
+ <!-- fix apache common pom -->
+ <profile>
+ <id>apache-release</id>
+
+ <properties>
+ <!-- to support multi-module source-release builds -->
+ <sourceReleaseAssemblyDescriptor>multimodule-source-release</sourceReleaseAssemblyDescriptor>
+ </properties>
+ <build>
+ <plugins>
+ <!-- to support multi-module source-release builds -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-jar-resource-bundle</artifactId>
+ <version>1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <!-- to run source plugin without forking -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources-nf</id>
+ <goals><goal>jar-no-fork</goal></goals>
+ </execution>
+ <execution>
+ <id>attach-sources</id>
+ <phase/> <!-- turn off the plan jar one -->
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file