You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/08/08 17:43:31 UTC
svn commit: r1154995 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml
src/it/additionnal-dependencies-non-aggregate/invoker.properties
src/it/additionnal-dependencies/invoker.properties
Author: olamy
Date: Mon Aug 8 15:43:31 2011
New Revision: 1154995
URL: http://svn.apache.org/viewvc?rev=1154995&view=rev
Log:
simplify with using invoker selector
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties (with props)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1154995&r1=1154994&r2=1154995&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Mon Aug 8 15:43:31 2011
@@ -376,9 +376,7 @@ under the License.
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
- <!-- those its are 1.6 required doclava need 1.6
<pomInclude>additionnal-dependencies*/pom.xml</pomInclude>
- -->
<pomInclude>MJAVADOC-110/pom.xml</pomInclude>
<pomInclude>MJAVADOC-126/pom.xml</pomInclude>
<pomInclude>MJAVADOC-137/pom.xml</pomInclude>
@@ -498,25 +496,5 @@ under the License.
</plugins>
</build>
</profile>
- <profile>
- <id>doclava</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <!-- those tests use doclava which is 1.6 required -->
- <pomIncludes combine.children="append">
- <pomInclude>additionnal-dependencies*/pom.xml</pomInclude>
- </pomIncludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties?rev=1154995&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties Mon Aug 8 15:43:31 2011
@@ -0,0 +1 @@
+invoker.java.version = 1.6+
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties?rev=1154995&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties Mon Aug 8 15:43:31 2011
@@ -0,0 +1 @@
+invoker.java.version = 1.6+
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision