瀏覽代碼

AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)

Jayush Luniya 10 年之前
父節點
當前提交
6b382fc709

+ 1 - 1
ambari-metrics/pom.xml

@@ -154,7 +154,7 @@
               <name>package-release</name>
               <name>package-release</name>
               <value>${project.version}</value>
               <value>${project.version}</value>
               <regex>
               <regex>
-                ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)).*
+                ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
               </regex>
               </regex>
               <replacement>$5</replacement>
               <replacement>$5</replacement>
               <failIfNoMatch>true</failIfNoMatch>
               <failIfNoMatch>true</failIfNoMatch>

+ 1 - 1
ambari-web/set-ambari-version.cmd

@@ -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 See the License for the specific language governing permissions and
 rem limitations under the License.
 rem limitations under the License.
 
 
-powershell -File set-ambari-version.ps1 %*
+powershell -File set-ambari-version.ps1 %* < NUL

+ 1 - 1
ambari-web/set-default-stack-version.cmd

@@ -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 See the License for the specific language governing permissions and
 rem limitations under the License.
 rem limitations under the License.
 
 
-powershell -File set-default-stack-version.ps1 %*
+powershell -File set-default-stack-version.ps1 %* < NUL

+ 1 - 1
ambari-web/toggle-experimental.cmd

@@ -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 See the License for the specific language governing permissions and
 rem limitations under the License.
 rem limitations under the License.
 
 
-powershell -File toggle-experimental.ps1 %*
+powershell -File toggle-experimental.ps1 %* < NUL

+ 16 - 0
contrib/views/capacity-scheduler/pom.xml

@@ -160,6 +160,22 @@
               </arguments>
               </arguments>
             </configuration>
             </configuration>
           </execution>
           </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>
           <execution>
             <id>Brunch build</id>
             <id>Brunch build</id>
             <phase>generate-resources</phase>
             <phase>generate-resources</phase>

+ 1 - 2
contrib/views/capacity-scheduler/src/main/resources/ui/package.json

@@ -11,8 +11,7 @@
     "node": "~0.6.10 || 0.8 || 0.9"
     "node": "~0.6.10 || 0.8 || 0.9"
   },
   },
   "scripts": {
   "scripts": {
-    "start": "brunch watch --server",
-    "postinstall" : "bower --allow-root install"
+    "start": "brunch watch --server"
   },
   },
   "dependencies": {
   "dependencies": {
     "javascript-brunch": "^1.7.1",
     "javascript-brunch": "^1.7.1",

+ 16 - 0
contrib/views/files/pom.xml

@@ -182,6 +182,22 @@
               </arguments>
               </arguments>
             </configuration>
             </configuration>
           </execution>
           </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>
           <execution>
             <id>Brunch build</id>
             <id>Brunch build</id>
             <phase>generate-resources</phase>
             <phase>generate-resources</phase>

+ 1 - 2
contrib/views/files/src/main/resources/ui/package.json

@@ -13,8 +13,7 @@
   },
   },
   "scripts": {
   "scripts": {
     "test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
     "test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
-    "start": "brunch watch --server",
-    "postinstall" : "bower --allow-root install"
+    "start": "brunch watch --server"
   },
   },
   "dependencies": {
   "dependencies": {
     "javascript-brunch": "^1.7.1",
     "javascript-brunch": "^1.7.1",

+ 16 - 0
contrib/views/pig/pom.xml

@@ -197,6 +197,22 @@
               </arguments>
               </arguments>
             </configuration>
             </configuration>
           </execution>
           </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>
           <execution>
             <id>Brunch build</id>
             <id>Brunch build</id>
             <phase>generate-resources</phase>
             <phase>generate-resources</phase>

+ 1 - 2
contrib/views/pig/src/main/resources/ui/pig-web/package.json

@@ -6,8 +6,7 @@
   },
   },
   "scripts": {
   "scripts": {
     "test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
     "test": "node_modules/phantomjs/bin/phantomjs runner.js public/tests.html",
-    "start": "brunch watch --server",
-    "postinstall" : "bower --allow-root install"
+    "start": "brunch watch --server"
   },
   },
   "dependencies": {
   "dependencies": {
     "brunch": "1.7.17",
     "brunch": "1.7.17",