ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: AMBARI-4418. Skip url replacement for windows build. (mahadev)
Date Fri, 24 Jan 2014 21:28:11 GMT
Updated Branches:
  refs/heads/trunk ff921e62a -> f31c604e4


AMBARI-4418. Skip url replacement for windows build. (mahadev)


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

Branch: refs/heads/trunk
Commit: f31c604e4790c7ec21037abc47ba5d8cb2849766
Parents: ff921e6
Author: Mahadev Konar <mahadev@apache.org>
Authored: Fri Jan 24 13:27:26 2014 -0800
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Fri Jan 24 13:27:26 2014 -0800

----------------------------------------------------------------------
 ambari-server/pom.xml | 192 +++++++++++++++++++++++----------------------
 1 file changed, 100 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f31c604e/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index b494b7b..50180fb 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0"?>
-<!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License. See accompanying LICENSE file.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you 
+  may not use this file except in compliance with the License. You may obtain 
+  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
+  required by applicable law or agreed to in writing, software distributed 
+  under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
+  OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+  the specific language governing permissions and limitations under the License. 
+  See accompanying LICENSE file. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
@@ -35,7 +31,7 @@
   <build>
     <plugins>
       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
+        <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <version>1.8</version>
         <executions>
@@ -77,7 +73,7 @@
                 <resource>
                   <directory>${basedir}/../</directory>
                   <includes>
-                      <include>**/version</include>
+                    <include>**/version</include>
                   </includes>
                   <filtering>true</filtering>
                 </resource>
@@ -128,13 +124,13 @@
             <exclude>conf/unix/krb5JAASLogin.conf</exclude>
             <exclude>**/*.json</exclude>
 
-            <!--gitignore content-->
+            <!--gitignore content -->
             <exclude>src/main/resources/db/newcerts/**</exclude>
 
             <!-- Stack definitions -->
             <exclude>src/main/resources/stacks/HDP/2.0._/services/HBASE/package/templates/regionservers.j2</exclude>
 
-            <!--test samples-->
+            <!--test samples -->
             <exclude>src/test/resources/TestAmbaryServer.samples/**</exclude>
             <exclude>src/test/resources/*.txt</exclude>
             <exclude>src/test/resources/users_for_dn_with_space.ldif</exclude>
@@ -149,9 +145,11 @@
             <phase>process-classes</phase>
             <configuration>
               <tasks>
-                <java classname="org.eclipse.persistence.tools.weaving.jpa.StaticWeave"
-                      classpathref="maven.runtime.classpath" fork="true">
-                  <arg line="-loglevel FINE -persistenceinfo src/main/resources target/classes
target/classes"/>
+                <java
+                  classname="org.eclipse.persistence.tools.weaving.jpa.StaticWeave"
+                  classpathref="maven.runtime.classpath" fork="true">
+                  <arg
+                    line="-loglevel FINE -persistenceinfo src/main/resources target/classes
target/classes" />
                 </java>
               </tasks>
             </configuration>
@@ -319,17 +317,17 @@
                 <source>
                   <location>src/main/resources/Ambari-DDL-MySQL-DROP.sql</location>
                 </source>
-                 <source>
+                <source>
                   <location>src/main/resources/hive-schema-0.10.0.oracle.sql</location>
                 </source>
-                  <source>
+                <source>
                   <location>src/main/resources/hive-schema-0.12.0.oracle.sql</location>
                 </source>
                 <source>
                   <location>${project.build.directory}/DBConnectionVerification.jar</location>
-                </source> 
+                </source>
                 <source>
-                  <!-- This file is also included into agent rpm-->
+                  <!-- This file is also included into agent rpm -->
                   <location>src/main/resources/role_command_order.json</location>
                 </source>
               </sources>
@@ -483,27 +481,24 @@
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <version>3.1.11</version>
-        <!--
-        <configuration>
-          <licenseLocation>/path/to/clover.license</licenseLocation>
-        </configuration>
-        -->
+        <!-- <configuration> <licenseLocation>/path/to/clover.license</licenseLocation>

+          </configuration> -->
       </plugin>
       <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>buildnumber-maven-plugin</artifactId>
-          <version>${buildnumber-maven-plugin-version}</version>
-          <configuration>
-              <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
-          </configuration>    
-          <executions>
-              <execution>
-                  <phase>validate</phase>
-                  <goals>
-                      <goal>create</goal>
-                  </goals>
-              </execution>
-          </executions>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>${buildnumber-maven-plugin-version}</version>
+        <configuration>
+          <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -511,46 +506,17 @@
         <version>1.7</version>
         <executions>
           <execution>
-            <id>set-hdp-url-classes</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target name="ambari-server-compile">
-                <exec dir="${basedir}" executable="bash" failonerror="true">
-                  <arg value="${basedir}/set-hdp-repo-url.sh"/>
-                  <arg value="${hdpUrlForCentos6}"/>
-                </exec>
-              </target>
-            </configuration>
-          </execution>
-          <execution>
-            <id>set-hdp-url-packages</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target name="ambari-server-compile">
-                <exec dir="${basedir}" executable="bash" failonerror="true">
-                  <arg value="${basedir}/set-hdp-repo-url.sh"/>
-                  <arg value="${hdpUrlForCentos6}"/>
-                  <arg value="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}"/>
-                </exec>
-              </target>
-            </configuration>
-          </execution>
-          <execution>
             <phase>package</phase>
             <configuration>
               <tasks>
                 <jar destfile="target/DBConnectionVerification.jar">
-                     <fileset dir="${basedir}/target/classes/" includes="**/DBConnectionVerification.class"
/>
-		     <manifest>
-		      <attribute name="Main-Class" value="org.apache.ambari.server.DBConnectionVerification"/>
-		     </manifest>
-		</jar>
+                  <fileset dir="${basedir}/target/classes/"
+                    includes="**/DBConnectionVerification.class" />
+                  <manifest>
+                    <attribute name="Main-Class"
+                      value="org.apache.ambari.server.DBConnectionVerification" />
+                  </manifest>
+                </jar>
               </tasks>
             </configuration>
             <goals>
@@ -578,6 +544,54 @@
     </resources>
   </build>
   <profiles>
+    <profile>
+      <id>replaceurl</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>set-hdp-url-classes</id>
+                <phase>process-classes</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="ambari-server-compile">
+                    <exec dir="${basedir}" executable="bash"
+                      failonerror="true">
+                      <arg value="${basedir}/set-hdp-repo-url.sh" />
+                      <arg value="${hdpUrlForCentos6}" />
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+              <execution>
+                <id>set-hdp-url-packages</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="ambari-server-compile">
+                    <exec dir="${basedir}" executable="bash"
+                      failonerror="true">
+                      <arg value="${basedir}/set-hdp-repo-url.sh" />
+                      <arg value="${hdpUrlForCentos6}" />
+                      <arg
+                        value="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}"
/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   <dependencies>
     <dependency>
@@ -831,9 +845,9 @@
       <version>9.1-901.jdbc4</version>
     </dependency>
     <dependency>
-	  <groupId>org.apache.httpcomponents</groupId>
-	  <artifactId>httpclient</artifactId>
-	  <version>4.2.5</version>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.5</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -856,13 +870,7 @@
       <version>2.2.1</version>
     </dependency>
   </dependencies>
-  <!--<reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.2</version>
-            </plugin>
-        </plugins>
-    </reporting>-->
+  <!--<reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>

+    <artifactId>findbugs-maven-plugin</artifactId> <version>2.5.2</version>
</plugin> 
+    </plugins> </reporting> -->
 </project>


Mime
View raw message