You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/03/28 08:14:58 UTC
[cayenne] branch STABLE-4.1 updated: Exclude building docs in src
profile
This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new 8d6607a Exclude building docs in src profile
8d6607a is described below
commit 8d6607a8e30f82c0cfe2bdca3e7de013ec38ffcb
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Mon Mar 25 16:32:53 2019 +0300
Exclude building docs in src profile
(cherry picked from commit e561eef80b18aadc2b91b2b23977e3d288e0d95d)
---
assembly/pom.xml | 9 ++++++++-
docs/asciidoc/cayenne-guide/pom.xml | 4 ++--
docs/asciidoc/getting-started-db-first/pom.xml | 4 ++--
docs/asciidoc/getting-started-guide/pom.xml | 4 ++--
docs/asciidoc/getting-started-rop/pom.xml | 4 ++--
docs/asciidoc/upgrade-guide/pom.xml | 4 ++--
docs/doc/pom.xml | 2 +-
docs/pom.xml | 14 ++++++++++++++
8 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index cacb84e..de86b2d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -34,6 +34,10 @@
<description>An assembly of Cayenne into a generically runnable package.</description>
+ <properties>
+ <build.docs>process-resources</build.docs>
+ </properties>
+
<dependencies>
<dependency>
@@ -186,6 +190,9 @@
<!-- SOURCE assembly - the base assembly of a release build -->
<profile>
<id>src</id>
+ <properties>
+ <build.docs>none</build.docs>
+ </properties>
<build>
<plugins>
<plugin>
@@ -240,7 +247,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>process-resources</phase>
+ <phase>${build.docs}</phase>
<configuration>
<tasks>
<copy todir="${project.build.directory}/doc-staging">
diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/asciidoc/cayenne-guide/pom.xml
index f7fc84c..0aceb4b 100644
--- a/docs/asciidoc/cayenne-guide/pom.xml
+++ b/docs/asciidoc/cayenne-guide/pom.xml
@@ -83,7 +83,7 @@
<!-- generate standalone html help -->
<execution>
<id>asciidoctor-html-standalone</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -100,7 +100,7 @@
<!-- generate PDF -->
<execution>
<id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
diff --git a/docs/asciidoc/getting-started-db-first/pom.xml b/docs/asciidoc/getting-started-db-first/pom.xml
index bbe45b4..69197c6 100644
--- a/docs/asciidoc/getting-started-db-first/pom.xml
+++ b/docs/asciidoc/getting-started-db-first/pom.xml
@@ -85,7 +85,7 @@
<!-- generate standalone html help -->
<execution>
<id>asciidoctor-html-standalone</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -102,7 +102,7 @@
<!-- generate PDF -->
<execution>
<id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
diff --git a/docs/asciidoc/getting-started-guide/pom.xml b/docs/asciidoc/getting-started-guide/pom.xml
index 73adc90..a898545 100644
--- a/docs/asciidoc/getting-started-guide/pom.xml
+++ b/docs/asciidoc/getting-started-guide/pom.xml
@@ -85,7 +85,7 @@
<!-- generate standalone html help -->
<execution>
<id>asciidoctor-html-standalone</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -102,7 +102,7 @@
<!-- generate PDF -->
<execution>
<id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
diff --git a/docs/asciidoc/getting-started-rop/pom.xml b/docs/asciidoc/getting-started-rop/pom.xml
index 1d859f5..c67377c 100644
--- a/docs/asciidoc/getting-started-rop/pom.xml
+++ b/docs/asciidoc/getting-started-rop/pom.xml
@@ -82,7 +82,7 @@
<!-- generate standalone html help -->
<execution>
<id>asciidoctor-html-standalone</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -99,7 +99,7 @@
<!-- generate PDF -->
<execution>
<id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
diff --git a/docs/asciidoc/upgrade-guide/pom.xml b/docs/asciidoc/upgrade-guide/pom.xml
index e93837f..114b84c 100644
--- a/docs/asciidoc/upgrade-guide/pom.xml
+++ b/docs/asciidoc/upgrade-guide/pom.xml
@@ -81,7 +81,7 @@
<!-- generate standalone html help -->
<execution>
<id>asciidoctor-html-standalone</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -98,7 +98,7 @@
<!-- generate PDF -->
<execution>
<id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index fea8cee..a0d7b15 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -167,7 +167,7 @@
<executions>
<execution>
<id>javadoc</id>
- <phase>generate-resources</phase>
+ <phase>${build.docs}</phase>
<goals>
<goal>javadoc</goal>
</goals>
diff --git a/docs/pom.xml b/docs/pom.xml
index 034ee15..fccb99e 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -38,6 +38,10 @@
<module>asciidoc</module>
</modules>
+ <properties>
+ <build.docs>generate-resources</build.docs>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -49,4 +53,14 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>src</id>
+ <properties>
+ <build.docs>none</build.docs>
+ </properties>
+ </profile>
+ </profiles>
+
</project>