sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cheol...@apache.org
Subject [2/3] git commit: SQOOP-889: Move tomcat related properties from dist/pom.xml to root pom.xml
Date Fri, 22 Feb 2013 20:19:23 GMT
SQOOP-889: Move tomcat related properties from dist/pom.xml to root pom.xml

(Jarcec Cecho via Cheolsoo Park)


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

Branch: refs/heads/sqoop2
Commit: 4e629866beae0738a3b67447de238884b82caac6
Parents: 6eb27b8
Author: Cheolsoo Park <cheolsoo@apache.org>
Authored: Fri Feb 22 12:03:09 2013 -0800
Committer: Cheolsoo Park <cheolsoo@apache.org>
Committed: Fri Feb 22 12:19:06 2013 -0800

----------------------------------------------------------------------
 dist/pom.xml |    9 +--------
 pom.xml      |    3 +++
 2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/4e629866/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index 4ce8d52..fccda25 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -21,13 +21,6 @@ limitations under the License.
 
   <modelVersion>4.0.0</modelVersion>
 
-  <properties>
-    <tomcat.majorVersion>6</tomcat.majorVersion>
-    <tomcat.minorVersion>0.36</tomcat.minorVersion>
-    <tomcat.version>${tomcat.majorVersion}.${tomcat.minorVersion}</tomcat.version>
-  </properties>
-
-
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>sqoop</artifactId>
@@ -155,7 +148,7 @@ limitations under the License.
                      </copy>
 
                     <!-- Build server directory -->
-                    <get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
+                    <get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
                          dest="target/apache-tomcat.tar.gz" verbose="true" skipexisting="true"/>
                     <untar src="target/apache-tomcat.tar.gz" dest="target" compression="gzip"/>
                     <move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server"/>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/4e629866/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee013f2..5e1b43b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,9 @@ limitations under the License.
     <log4j.version>1.2.16</log4j.version>
     <servlet.version>2.5</servlet.version>
     <cargo.version>1.3.2</cargo.version>
+    <tomcat.major.version>6</tomcat.major.version>
+    <tomcat.minor.version>0.36</tomcat.minor.version>
+    <tomcat.version>${tomcat.major.version}.${tomcat.minor.version}</tomcat.version>
   </properties>
 
   <dependencies>


Mime
View raw message