Author: veithen
Date: Tue Dec 8 19:48:35 2015
New Revision: 1718682
URL: http://svn.apache.org/viewvc?rev=1718682&view=rev
Log:
Establish a proper dependency between apidocs and rampart-dist.
Added:
axis/axis2/java/rampart/trunk/apidocs/src/
axis/axis2/java/rampart/trunk/apidocs/src/main/
axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/
axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml (with
props)
Modified:
axis/axis2/java/rampart/trunk/apidocs/pom.xml
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/apidocs/pom.xml?rev=1718682&r1=1718681&r2=1718682&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/apidocs/pom.xml Tue Dec 8 19:48:35 2015
@@ -49,26 +49,30 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<executions>
<execution>
<id>site-javadoc</id>
<phase>site</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>javadoc-no-fork</goal>
</goals>
+ <configuration>
+
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+ <destDir>.</destDir>
+ </configuration>
</execution>
<execution>
<id>dist-javadoc</id>
<phase>package</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>javadoc-no-fork</goal>
</goals>
+ <configuration>
+
<reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
+ </configuration>
</execution>
</executions>
<configuration>
-
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
- <destDir>.</destDir>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
@@ -86,6 +90,22 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/apidocs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
Added: axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml?rev=1718682&view=auto
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml (added)
+++ axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml Tue Dec
8 19:48:35 2015
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly>
+ <id>javadoc</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/apidocs</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: axis/axis2/java/rampart/trunk/apidocs/src/main/assembly/apidocs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1718682&r1=1718681&r2=1718682&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Tue Dec 8
19:48:35 2015
@@ -37,13 +37,17 @@
<include>org.owasp.esapi:esapi:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
+ <includes>
+ <include>*:apidocs:zip:javadoc</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>../../apidocs/target/site</directory>
- <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../rampart-samples</directory>
<outputDirectory>${dist.dir}/samples</outputDirectory>
</fileSet>
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1718682&r1=1718681&r2=1718682&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Tue Dec 8
19:48:35 2015
@@ -123,6 +123,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apidocs</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <type>zip</type>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1718682&r1=1718681&r2=1718682&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Dec 8 19:48:35 2015
@@ -185,6 +185,14 @@
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
