Return-Path: 
 <ambari-commits-return-909-apmail-incubator-ambari-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9F6F3DAB9
	for <apmail-incubator-ambari-commits-archive@minotaur.apache.org>;
 Thu, 23 Aug 2012 23:51:07 +0000 (UTC)
Received: (qmail 45355 invoked by uid 500); 23 Aug 2012 23:51:07 -0000
Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org
Received: (qmail 45328 invoked by uid 500); 23 Aug 2012 23:51:07 -0000
Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ambari-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ambari-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ambari-commits@incubator.apache.org>
List-Id: <ambari-commits.incubator.apache.org>
Reply-To: ambari-dev@incubator.apache.org
Delivered-To: mailing list ambari-commits@incubator.apache.org
Received: (qmail 45321 invoked by uid 99); 23 Aug 2012 23:51:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 23:51:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 23:51:04 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6FDE12388962;
	Thu, 23 Aug 2012 23:50:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1376790 - in /incubator/ambari/branches/AMBARI-666:
 AMBARI-666-CHANGES.txt ambari-agent/pom.xml ambari-server/pom.xml
Date: Thu, 23 Aug 2012 23:50:20 -0000
To: ambari-commits@incubator.apache.org
From: hitesh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120823235020.6FDE12388962@eris.apache.org>

Author: hitesh
Date: Thu Aug 23 23:50:19 2012
New Revision: 1376790

URL: http://svn.apache.org/viewvc?rev=1376790&view=rev
Log:
 AMBARI-680. Fix pom structure. (hitesh)(Contributed by hitesh)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
    incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1376790&r1=1376789&r2=1376790&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Thu Aug 23 23:50:19 2012
@@ -20,3 +20,4 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-680. Fix pom structure. (hitesh)

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml?rev=1376790&r1=1376789&r2=1376790&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml Thu Aug 23 23:50:19 2012
@@ -1,64 +1,39 @@
 <?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.
+-->
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <name>ambari-agent</name>
   <url>http://maven.apache.org</url>
-  <properties>
-    <jetty.version>7.0.0.pre5</jetty.version>
-  </properties>
   <parent>
     <groupId>org.apache.ambari</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <artifactId>ambari</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <artifactId>ambari-project</artifactId>
+    <relativePath>../ambari-project</relativePath>
   </parent>
   <dependencies>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-ssl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-plus</artifactId>
-    </dependency>
-    <dependency>
-      <!-- the implementation of JAX-RS -->
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <!-- PROVIDED BY CONTAINER; HERE FOR COMPILE ONLY -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
     <!-- TEST SCOPE DEPENDENCIES -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    <dependency>
-      <!-- used in integration tests -->
-      <groupId>javanettasks</groupId>
-      <artifactId>httpunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml?rev=1376790&r1=1376789&r2=1376790&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml Thu Aug 23 23:50:19 2012
@@ -18,15 +18,16 @@
 <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</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>ambari-project</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-server</artifactId>
   <packaging>jar</packaging>
   <name>ambari-server</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <description>Ambari Server</description>
   <build>
     <resources>
@@ -127,10 +128,6 @@
       <artifactId>mockito-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-client</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
     </dependency>