ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1689238 - in /webservices/woden/trunk/java: pom.xml woden-dist/pom.xml woden-dist/src/main/assembly/dom.xml
Date Sun, 05 Jul 2015 11:37:13 GMT
Author: veithen
Date: Sun Jul  5 11:37:13 2015
New Revision: 1689238

URL: http://svn.apache.org/r1689238
Log:
If a Maven module relies on the output of another module, then it should depend on (and use)
the artifacts produced by that module, but not access the target directory of that module
directly.

Modified:
    webservices/woden/trunk/java/pom.xml
    webservices/woden/trunk/java/woden-dist/pom.xml
    webservices/woden/trunk/java/woden-dist/src/main/assembly/dom.xml

Modified: webservices/woden/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/pom.xml?rev=1689238&r1=1689237&r2=1689238&view=diff
==============================================================================
--- webservices/woden/trunk/java/pom.xml (original)
+++ webservices/woden/trunk/java/pom.xml Sun Jul  5 11:37:13 2015
@@ -214,23 +214,6 @@
                         <version>1.1</version>
                     </plugin>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.6.1</version>
-                        <configuration>
-                            <excludePackageNames>org.apache.woden.internal</excludePackageNames>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>aggregate</id>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId> 
                         <artifactId>maven-release-plugin</artifactId>
                         <version>2.0-beta-9</version> 
@@ -260,23 +243,6 @@
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.6.1</version>
-                        <configuration> 
-                            <excludePackageNames>org.apache.woden.internal</excludePackageNames>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>aggregate</id>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.2</version>
                         <inherited>false</inherited>

Modified: webservices/woden/trunk/java/woden-dist/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-dist/pom.xml?rev=1689238&r1=1689237&r2=1689238&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-dist/pom.xml (original)
+++ webservices/woden/trunk/java/woden-dist/pom.xml Sun Jul  5 11:37:13 2015
@@ -25,6 +25,26 @@
     <build>
         <plugins>
             <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>javadoc-no-fork</goal>
+                        </goals>
+                        <configuration>
+                            <reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
+                            <includeDependencySources>true</includeDependencySources>
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+                            </dependencySourceIncludes>
+                            <excludePackageNames>org.apache.woden.internal</excludePackageNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -68,16 +88,6 @@
             <groupId>org.apache.woden</groupId>
             <artifactId>woden-ant</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-launcher</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.xmlschema</groupId>

Modified: webservices/woden/trunk/java/woden-dist/src/main/assembly/dom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-dist/src/main/assembly/dom.xml?rev=1689238&r1=1689237&r2=1689238&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-dist/src/main/assembly/dom.xml (original)
+++ webservices/woden/trunk/java/woden-dist/src/main/assembly/dom.xml Sun Jul  5 11:37:13
2015
@@ -29,8 +29,8 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../target/site</directory>
-            <outputDirectory>docs</outputDirectory>
+            <directory>${project.build.directory}/apidocs</directory>
+            <outputDirectory>docs/apidocs</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
@@ -71,6 +71,9 @@
             <includes>
                 <include>*:*:jar</include>
             </includes>
+            <excludes>
+                <exclude>org.apache.ant:*:*</exclude>
+            </excludes>
         </dependencySet>
     </dependencySets>
 </assembly>



Mime
View raw message