This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 731fa70 [NO ISSUE] Add raw SQL++ grammar to docs
731fa70 is described below
commit 731fa7048669a4d2ccfd9b2a96e2a8d5da856484
Author: Ian Maxon <[email protected]>
AuthorDate: Fri Sep 25 13:36:24 2020 -0700
[NO ISSUE] Add raw SQL++ grammar to docs
Change-Id: Ie8dd906de9369da9db810c94e891d50d3266c190
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8103
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Ian Maxon <[email protected]>
Reviewed-by: Dmitry Lychagin <[email protected]>
Contrib: Ian Maxon <[email protected]>
---
asterixdb/asterix-doc/pom.xml | 12 +++++++++++
asterixdb/asterix-doc/src/site/site.xml | 1 +
asterixdb/asterix-lang-sqlpp/pom.xml | 36 +++++++--------------------------
3 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml
index f7d914e..c54f439 100644
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@ -81,6 +81,18 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>sqlpp</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.basedir}/../asterix-lang-sqlpp/target/site/jjdoc/SQLPP.html"
tofile="${project.build.directory}/site/SQLPP.html"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/asterixdb/asterix-doc/src/site/site.xml
b/asterixdb/asterix-doc/src/site/site.xml
index 6db028e..f1cd93b 100644
--- a/asterixdb/asterix-doc/src/site/site.xml
+++ b/asterixdb/asterix-doc/src/site/site.xml
@@ -80,6 +80,7 @@
<menu name="Queries">
<item name="The SQL++ Query Language" href="sqlpp/manual.html"/>
+ <item name="Raw SQL++ Grammar" href="SQLPP.html"/>
<item name="Builtin Functions" href="sqlpp/builtins.html"/>
</menu>
diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml
b/asterixdb/asterix-lang-sqlpp/pom.xml
index 2a2783b..b04aa66 100644
--- a/asterixdb/asterix-lang-sqlpp/pom.xml
+++ b/asterixdb/asterix-lang-sqlpp/pom.xml
@@ -52,6 +52,13 @@
<javaUnicodeEscape>true</javaUnicodeEscape>
</configuration>
</execution>
+ <execution>
+ <id>javacc-jjdoc</id>
+ <goals>
+ <goal>jjdoc</goal>
+ </goals>
+ <phase>generate-test-sources</phase>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -106,35 +113,6 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>jjdoc</id>
- <activation>
- <property>
- <name>jjdoc.skip</name>
- <value>!true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>javacc-jjdoc</id>
- <goals>
- <goal>jjdoc</goal>
- </goals>
- <phase>generate-test-sources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
