You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2020/02/28 16:38:13 UTC
[unomi-site] branch master updated: UNOMI-262 Use Jekyll to
generate site - Fix Maven configuration to make publishing work properly.
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi-site.git
The following commit(s) were added to refs/heads/master by this push:
new 04c8741 UNOMI-262 Use Jekyll to generate site - Fix Maven configuration to make publishing work properly.
04c8741 is described below
commit 04c8741226f73ef243f39b5bf1a8adbc71802397
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Fri Feb 28 17:38:06 2020 +0100
UNOMI-262 Use Jekyll to generate site
- Fix Maven configuration to make publishing work properly.
---
pom.xml | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f50d7b..37bc49d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,9 @@
<phase>generate-resources</phase>
<configuration>
<file>${project.build.directory}/rubygems/bin/jekyll</file>
- <execArgs>build --trace --source ${project.basedir}/src/main/webapp --destination ${project.build.outputDirectory}</execArgs>
+ <execArgs>build --trace --source ${project.basedir}/src/main/webapp --destination
+ ${project.build.directory}/generated-jekyll
+ </execArgs>
</configuration>
</execution>
<execution>
@@ -194,7 +196,9 @@
</goals>
<configuration>
<file>${project.build.directory}/rubygems/bin/jekyll</file>
- <execArgs>serve --trace --source ${project.basedir}/src/main/webapp --destination ${project.build.outputDirectory}</execArgs>
+ <execArgs>serve --trace --source ${project.basedir}/src/main/webapp --destination
+ ${project.build.directory}/generated-jekyll
+ </execArgs>
</configuration>
<phase>none</phase>
</execution>
@@ -205,14 +209,23 @@
<addProjectClasspath>true</addProjectClasspath>
<jrubyVerbose>false</jrubyVerbose>
</configuration>
- </plugin> <plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.3</version>
+ <configuration>
+ <warSourceDirectory>${project.build.directory}/generated-jekyll</warSourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>
<configuration>
<checkinComment>[scm-publish] Updating Unomi website</checkinComment>
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/unomi/website/</pubScmUrl>
- <content>src/main/webapp</content>
+ <content>${project.build.directory}/generated-jekyll</content>
<ignorePathsToDelete>
<ignorePathToDelete>docs/**</ignorePathToDelete>
<ignorePathToDelete>rest-api-doc/**</ignorePathToDelete>