accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject git commit: ACCUMULO-1642 Remove intermediate examples pom
Date Fri, 06 Sep 2013 17:13:27 GMT
Updated Branches:
  refs/heads/master 2d54a4faf -> a35757a54


ACCUMULO-1642 Remove intermediate examples pom


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

Branch: refs/heads/master
Commit: a35757a54ede0d821734eb673341ac30754b1550
Parents: 2d54a4f
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Sep 6 13:12:48 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Sep 6 13:12:48 2013 -0400

----------------------------------------------------------------------
 examples/pom.xml        | 31 -------------------------------
 examples/simple/pom.xml |  3 ++-
 pom.xml                 |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a35757a5/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
deleted file mode 100644
index 087195a..0000000
--- a/examples/pom.xml
+++ /dev/null
@@ -1,31 +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-examples</artifactId>
-  <packaging>pom</packaging>
-  <name>Examples</name>
-  <modules>
-    <module>simple</module>
-  </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a35757a5/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 9865b5f..38c6a2c 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -19,8 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-examples</artifactId>
+    <artifactId>accumulo-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>accumulo-examples-simple</artifactId>
   <name>Simple Examples</name>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a35757a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d6ba50..1596aff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <module>fate</module>
     <module>server</module>
     <module>start</module>
-    <module>examples</module>
+    <module>examples/simple</module>
     <module>assemble</module>
     <module>proxy</module>
     <module>test</module>


Mime
View raw message