You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2017/12/14 04:32:19 UTC
ignite git commit: IGNITE-6920 Fixed rhel detection in web console
direct-install.
Repository: ignite
Updated Branches:
refs/heads/master c9d6dd5f4 -> 33258762a
IGNITE-6920 Fixed rhel detection in web console direct-install.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33258762
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33258762
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33258762
Branch: refs/heads/master
Commit: 33258762a92214bda691b7f3fa5d93ad3aee2e21
Parents: c9d6dd5
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Dec 14 11:32:11 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Dec 14 11:32:11 2017 +0700
----------------------------------------------------------------------
modules/web-console/DEVNOTES.txt | 2 +-
modules/web-console/pom.xml | 111 ++++++++++++++++++++++++++++++++--
2 files changed, 106 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/33258762/modules/web-console/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/web-console/DEVNOTES.txt b/modules/web-console/DEVNOTES.txt
index 6dbb15a..dfb017e 100644
--- a/modules/web-console/DEVNOTES.txt
+++ b/modules/web-console/DEVNOTES.txt
@@ -35,6 +35,6 @@ How to migrate model:
Ignite Web Console Direct-Install Maven Build Instructions
==========================================================
To build direct-install archive from sources run following command in Ignite project root folder:
-"mvn clean package -pl :ignite-web-agent,:ignite-web-console -am -P web-console -DskipTests=true"
+"mvn clean package -pl :ignite-web-agent,:ignite-web-console -am -P web-console -DskipTests=true -DskipClientDocs -Dmaven.javadoc.skip=true"
Assembled archive can be found here: `/modules/web-console/target/ignite-web-console-direct-install-*.zip`.
http://git-wip-us.apache.org/repos/asf/ignite/blob/33258762/modules/web-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web-console/pom.xml b/modules/web-console/pom.xml
index d5b72bf..1ef1992 100644
--- a/modules/web-console/pom.xml
+++ b/modules/web-console/pom.xml
@@ -88,11 +88,25 @@
</execution>
<execution>
+ <id>download dependencies for backend</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+
+ <configuration>
+ <workingDirectory>backend</workingDirectory>
+ <arguments>install --no-optional</arguments>
+ </configuration>
+ </execution>
+
+ <execution>
<id>build frontend</id>
<goals>
<goal>npm</goal>
</goals>
+ <phase>compile</phase>
+
<configuration>
<workingDirectory>frontend</workingDirectory>
<arguments>run build</arguments>
@@ -103,26 +117,111 @@
</execution>
<execution>
- <id>download dependencies for backend</id>
+ <id>build backend</id>
<goals>
<goal>npm</goal>
</goals>
+ <phase>compile</phase>
+
<configuration>
<workingDirectory>backend</workingDirectory>
- <arguments>install --no-optional</arguments>
+ <arguments>run build</arguments>
</configuration>
</execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
<execution>
- <id>build backend</id>
+ <id>clean-frontend-build</id>
<goals>
- <goal>npm</goal>
+ <goal>clean</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/frontend/build</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>clean-backend-build</id>
+ <goals>
+ <goal>clean</goal>
</goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/backend/build</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>remove-old-getos</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>process-resources</phase>
<configuration>
- <workingDirectory>backend</workingDirectory>
- <arguments>run build</arguments>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/backend/node_modules/mongodb-download/node_modules</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>fixed-rhel-detection</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <replace dir="${basedir}/backend/node_modules/mongodb-download/built"
+ token="/rhel/" value="/Red Hat Linux/i.test(os.dist) || /rhel/">
+ <include name="mongodb-download.js"/>
+ </replace>
+ </target>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>fixed-download-url</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <replace dir="${basedir}/backend/node_modules/mongodb-download/built"
+ token="http://downloads.mongodb.org" value="https://fastdl.mongodb.org">
+ <include name="mongodb-download.js"/>
+ </replace>
+ </target>
</configuration>
</execution>
</executions>