activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/3] activemq-artemis git commit: Changing npm front end plugin to be used only on the release profile Also this is filtering node-js installation out of the source installation
Date Mon, 28 Sep 2015 20:05:27 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master da17f039a -> eae2a2ea4


Changing npm front end plugin to be used only on the release profile
Also this is filtering node-js installation out of the source installation


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cfce98cb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cfce98cb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cfce98cb

Branch: refs/heads/master
Commit: cfce98cb45917dde1c4c3921c4de07f6588b9ba2
Parents: 67e3e20
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Sep 28 11:09:44 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Sep 28 15:43:32 2015 -0400

----------------------------------------------------------------------
 .../src/main/assembly/source-assembly.xml       |  4 ++
 artemis-website/package.json                    |  1 -
 artemis-website/pom.xml                         | 65 +++++++++++---------
 pom.xml                                         |  2 -
 4 files changed, 39 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfce98cb/artemis-distribution/src/main/assembly/source-assembly.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
index 2f1dea7..0eeb9e3 100644
--- a/artemis-distribution/src/main/assembly/source-assembly.xml
+++ b/artemis-distribution/src/main/assembly/source-assembly.xml
@@ -45,6 +45,10 @@
             <!-- Exclude all docs except user manual -->
             <exclude>docs/diagrams/</exclude>
 
+            <!-- Exclude stuff generated by the npm build -->
+            <exclude>artemis-website/node/</exclude>
+            <exclude>artemis-website/node_modules/</exclude>
+
             <!-- Exclude Release and Dev files -->
             <exclude>RELEASING.md</exclude>
             <exclude>ratReport.txt</exclude>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfce98cb/artemis-website/package.json
----------------------------------------------------------------------
diff --git a/artemis-website/package.json b/artemis-website/package.json
index 16813c5..9bf826f 100644
--- a/artemis-website/package.json
+++ b/artemis-website/package.json
@@ -8,7 +8,6 @@
     "url": "https://github.com/apache/activemq-artemis"
   },
   "devDependencies": {
-      "gitbook": "~1.5.0",
       "gitbook-cli": "~0.3.6"
   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfce98cb/artemis-website/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index fd09c7b..f29200b 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -80,38 +80,15 @@
       <webapp-dir>${project.artifactId}-${project.version}</webapp-dir>
       <webapp-outdir-user-manual>${basedir}/target/classes/user-manual</webapp-outdir-user-manual>
       <webapp-outdir-hacking-guide>${basedir}/target/classes/hacking-guide</webapp-outdir-hacking-guide>
+
+      <frontend-maven-plugin-version>0.0.24</frontend-maven-plugin-version>
+      <nodeVersion>v0.10.32</nodeVersion>
+      <npmVersion>1.4.12</npmVersion>
+
    </properties>
 
    <build>
       <plugins>
-         <plugin>
-             <groupId>com.github.eirslett</groupId>
-             <artifactId>frontend-maven-plugin</artifactId>
-             <version>${frontend-maven-plugin-version}</version>
-             <executions>
-                 <execution>
-                     <id>install node and npm</id>
-                     <goals>
-                         <goal>install-node-and-npm</goal>
-                     </goals>
-                     <phase>generate-sources</phase>
-                     <configuration>
-                         <nodeVersion>v0.11.16</nodeVersion>
-                         <npmVersion>1.4.12</npmVersion>
-                     </configuration>
-                 </execution>
-                 <execution>
-                     <id>npm install</id>
-                     <goals>
-                         <goal>npm</goal>
-                     </goals>
-                     <phase>generate-sources</phase>
-                     <configuration>
-                         <arguments>install</arguments>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin>
 
          <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
@@ -156,6 +133,34 @@
          <build>
             <plugins>
                <plugin>
+                  <groupId>com.github.eirslett</groupId>
+                  <artifactId>frontend-maven-plugin</artifactId>
+                  <version>${frontend-maven-plugin-version}</version>
+                  <executions>
+                     <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                           <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                           <nodeVersion>${nodeVersion}</nodeVersion>
+                           <npmVersion>${npmVersion}</npmVersion>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>npm install</id>
+                        <goals>
+                           <goal>npm</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                           <arguments>install</arguments>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
                   <artifactId>maven-antrun-plugin</artifactId>
                   <version>1.6</version>
                   <executions>
@@ -167,14 +172,14 @@
                                  <os family="windows" />
                               </condition>
                               <!-- lets generate the gitbook -->
-                              <mkdir dir="${webapp-outdir-user-manual}/gitbook" />
+                              <mkdir dir="${webapp-outdir-user-manual}" />
                               <echo>executing ${gitbook.cmd}</echo>
                               <exec executable="${gitbook.cmd}">
                                  <arg value="build" />
                                  <arg value="${basedir}/../docs/user-manual/en" />
                                  <arg value="${webapp-outdir-user-manual}" />
                               </exec>
-                              <mkdir dir="${webapp-outdir-hacking-guide}/gitbook" />
+                              <mkdir dir="${webapp-outdir-hacking-guide}" />
                               <echo>executing ${gitbook.cmd}</echo>
                               <exec executable="${gitbook.cmd}">
                                  <arg value="build" />

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfce98cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d8ebbe..def5ea2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,6 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-      <frontend-maven-plugin-version>0.0.24</frontend-maven-plugin-version>
-
      <!--
 
        note for idea users:


Mime
View raw message