@@ -154,7 +154,7 @@
<name>package-release</name>
<value>${project.version}</value>
<regex>
- ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)).*
+ ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
</regex>
<replacement>$5</replacement>
<failIfNoMatch>true</failIfNoMatch>
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-ambari-version.ps1 %*
+powershell -File set-ambari-version.ps1 %* < NUL
-powershell -File set-default-stack-version.ps1 %*
+powershell -File set-default-stack-version.ps1 %* < NUL
-powershell -File toggle-experimental.ps1 %*
+powershell -File toggle-experimental.ps1 %* < NUL
@@ -160,6 +160,22 @@
</arguments>
</configuration>
</execution>
+ <execution>
+ <id>Bower install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${ui.directory}</workingDirectory>
+ <executable>${ui.directory}/node/${node.executable}</executable>
+ <arguments>
+ <argument>${ui.directory}/node_modules/bower/bin/bower</argument>
+ <argument>install</argument>
+ <argument>--allow-root</argument>
+ </arguments>
+ </configuration>
+ </execution>
<execution>
<id>Brunch build</id>
<phase>generate-resources</phase>
@@ -11,8 +11,7 @@
"node": "~0.6.10 || 0.8 || 0.9"
},
"scripts": {
- "start": "brunch watch --server",
- "postinstall" : "bower --allow-root install"
+ "start": "brunch watch --server"
"dependencies": {
"javascript-brunch": "^1.7.1",
@@ -182,6 +182,22 @@
@@ -13,8 +13,7 @@
"test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
@@ -197,6 +197,22 @@
@@ -6,8 +6,7 @@
"brunch": "1.7.17",