accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [23/53] [abbrv] git commit: ACCUMULO-658 Remove unnecessary intermediate pom
Date Fri, 06 Sep 2013 18:22:51 GMT
ACCUMULO-658 Remove unnecessary intermediate pom


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

Branch: refs/heads/ACCUMULO-210
Commit: 5577200caa2b785124f5e8be384a465ba2d039f4
Parents: 2c0cbaf
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Aug 5 17:10:36 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Sep 6 14:20:12 2013 -0400

----------------------------------------------------------------------
 pom.xml                |  7 ++++++-
 server/base/pom.xml    |  3 ++-
 server/gc/pom.xml      |  3 ++-
 server/master/pom.xml  |  3 ++-
 server/monitor/pom.xml |  3 ++-
 server/pom.xml         | 36 ------------------------------------
 server/server/pom.xml  |  3 ++-
 server/tserver/pom.xml |  3 ++-
 8 files changed, 18 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c1d9bf..2070433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,6 @@
     <module>trace</module>
     <module>core</module>
     <module>fate</module>
-    <module>server</module>
     <module>start</module>
     <module>examples/simple</module>
     <module>assemble</module>
@@ -84,6 +83,12 @@
     <module>minicluster</module>
     <module>docs</module>
     <module>maven-plugin</module>
+    <module>server/base</module>
+    <module>server/gc</module>
+    <module>server/master</module>
+    <module>server/monitor</module>
+    <module>server/server</module>
+    <module>server/tserver</module>
   </modules>
   <scm>
     <connection>scm:git:git://git.apache.org/accumulo.git</connection>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 68ac433..5fc94cc 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-server-base</artifactId>
   <name>Server Base</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 085d55a..4a79b6f 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-gc</artifactId>
   <name>GC Server</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 343b888..6785943 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-master</artifactId>
   <name>Master Server</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 4543efe..c05b5c5 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-monitor</artifactId>
   <name>Monitor Server</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
deleted file mode 100644
index 4a79c58..0000000
--- a/server/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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>
-  <parent>
-    <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-project</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>accumulo-server-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Server Parent</name>
-  <modules>
-    <module>base</module>
-    <module>gc</module>
-    <module>master</module>
-    <module>monitor</module>
-    <module>server</module>
-    <module>tserver</module>
-  </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/server/pom.xml b/server/server/pom.xml
index 841e6e2..7f3b421 100644
--- a/server/server/pom.xml
+++ b/server/server/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-server</artifactId>
   <name>Server</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5577200c/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index a57de79..7acace2 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-server-parent</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-tserver</artifactId>
   <name>Tablet Server</name>


Mime
View raw message