You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2015/03/26 17:05:40 UTC
flink git commit: [FLINK-1769] Fix deploy bug caused by ScalaDoc
aggregation
Repository: flink
Updated Branches:
refs/heads/master 83db1db1c -> 2d373d88a
[FLINK-1769] Fix deploy bug caused by ScalaDoc aggregation
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2d373d88
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2d373d88
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2d373d88
Branch: refs/heads/master
Commit: 2d373d88a733a71dcba21e64401e98624fcf9547
Parents: 83db1db
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed Mar 25 14:50:40 2015 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Thu Mar 26 17:05:09 2015 +0100
----------------------------------------------------------------------
pom.xml | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2d373d88/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffa8120..d534eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,8 +435,8 @@ under the License.
</profile>
<profile>
- <!-- used for SNAPSHOT and regular releases -->
- <id>docs-and-source</id>
+ <!-- used for aggregating ScalaDoc with JavaDoc -->
+ <id>aggregate-scaladoc</id>
<build>
<plugins>
@@ -452,6 +452,18 @@ under the License.
<goals>
<goal>clean</goal>
</goals>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/classes.*.timestamp</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -498,6 +510,15 @@ under the License.
</execution>
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <!-- used for SNAPSHOT and regular releases -->
+ <id>docs-and-source</id>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -530,6 +551,7 @@ under the License.
</plugins>
</build>
</profile>
+
<profile>
<id>release</id>
<build>