You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/10/22 18:30:41 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1954] attempt improve site generation

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ee1d64  [OPENMEETINGS-1954] attempt improve site generation
2ee1d64 is described below

commit 2ee1d6490263e736b7852b9fa9f75c16acc6b986
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Oct 22 18:44:13 2018 +0700

    [OPENMEETINGS-1954] attempt improve site generation
---
 openmeetings-server/pom.xml | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 0446e6f..759b30d 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -235,43 +235,29 @@
 						<goals>
 							<goal>unpack</goal>
 						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>io.github.devacfr.maven.skins</groupId>
-									<artifactId>reflow-default-webdeps</artifactId>
-									<version>${reflow-maven-skin.version}</version>
-									<type>jar</type>
-									<overWrite>false</overWrite>
-									<includes>**/css/*.css,**/css/themes/${reflow-theme}/*.css,**/css/fontawesome/**,**/js/*.js</includes>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/site</outputDirectory>
-							<skip>${om.quick.build}</skip>
-						</configuration>
 					</execution>
 					<execution>
 						<id>unpack-css-js</id>
-						<phase>package</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>unpack</goal>
 						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>io.github.devacfr.maven.skins</groupId>
-									<artifactId>reflow-default-webdeps</artifactId>
-									<version>${reflow-maven-skin.version}</version>
-									<type>jar</type>
-									<overWrite>false</overWrite>
-									<includes>**/css/*.css,**/css/themes/${reflow-theme}/*.css,**/css/fontawesome/**,**/js/*.js</includes>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/site</outputDirectory>
-							<skip>${om.quick.build}</skip>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<artifactItems>
+						<artifactItem>
+							<groupId>io.github.devacfr.maven.skins</groupId>
+							<artifactId>reflow-default-webdeps</artifactId>
+							<version>${reflow-maven-skin.version}</version>
+							<type>jar</type>
+							<overWrite>false</overWrite>
+							<includes>**/css/*.css,**/css/themes/${reflow-theme}/*.css,**/css/fontawesome/**,**/js/*.js</includes>
+						</artifactItem>
+					</artifactItems>
+					<outputDirectory>${project.build.directory}/site</outputDirectory>
+					<skip>${om.quick.build}</skip>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>