You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/09/28 22:05:27 UTC
[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
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 <cl...@apache.org>
Authored: Mon Sep 28 11:09:44 2015 -0400
Committer: Clebert Suconic <cl...@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:
[3/3] activemq-artemis git commit: This closes #179
Posted by cl...@apache.org.
This closes #179
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/eae2a2ea
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/eae2a2ea
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/eae2a2ea
Branch: refs/heads/master
Commit: eae2a2ea402fd170f30cdb6633d8272d498bc019
Parents: da17f03 cfce98c
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 28 16:04:49 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 28 16:04:49 2015 -0400
----------------------------------------------------------------------
.../src/main/assembly/source-assembly.xml | 4 ++
artemis-website/.gitignore | 2 +
artemis-website/package.json | 13 +++++++
artemis-website/pom.xml | 40 ++++++++++++++++++--
pom.xml | 3 ++
5 files changed, 59 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: Added npm-frontend-plugin to
install gitbook and use from maven directly
Posted by cl...@apache.org.
Added npm-frontend-plugin to install gitbook and use from maven directly
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/67e3e207
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/67e3e207
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/67e3e207
Branch: refs/heads/master
Commit: 67e3e207cf2961b4a96e19ecda8fa264eaac3cdf
Parents: da17f03
Author: Paul Gallagher <pg...@redhat.com>
Authored: Tue Sep 15 16:47:48 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 28 15:43:32 2015 -0400
----------------------------------------------------------------------
artemis-website/.gitignore | 2 ++
artemis-website/package.json | 14 ++++++++++++++
artemis-website/pom.xml | 31 ++++++++++++++++++++++++++++++-
pom.xml | 5 +++++
4 files changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67e3e207/artemis-website/.gitignore
----------------------------------------------------------------------
diff --git a/artemis-website/.gitignore b/artemis-website/.gitignore
new file mode 100644
index 0000000..f4af8ab
--- /dev/null
+++ b/artemis-website/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+node/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67e3e207/artemis-website/package.json
----------------------------------------------------------------------
diff --git a/artemis-website/package.json b/artemis-website/package.json
new file mode 100644
index 0000000..16813c5
--- /dev/null
+++ b/artemis-website/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "artemis-websiteb",
+ "version": "1.5.0",
+ "description": "ActiveMQ Artemis Web",
+ "license": "Apache-2.0",
+ "repository": {
+ "type": "git",
+ "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/67e3e207/artemis-website/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index fdf25d6..fd09c7b 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -85,6 +85,35 @@
<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>
<version>2.10.1</version>
<executions>
@@ -134,7 +163,7 @@
<phase>generate-sources</phase>
<configuration>
<target>
- <condition property="gitbook.cmd" value="gitbook.cmd" else="gitbook">
+ <condition property="gitbook.cmd" value="${basedir}/node_modules/.bin/gitbook.cmd" else="${basedir}/node_modules/.bin/gitbook">
<os family="windows" />
</condition>
<!-- lets generate the gitbook -->
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67e3e207/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f26dd51..6d8ebbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,8 @@
<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:
@@ -1023,6 +1025,9 @@
<exclude>**/src/test/resources/keystore</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.redo</exclude>
+ <exclude>**/node/**</exclude>
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/package.json</exclude>
</excludes>
</configuration>
<executions>