accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1339784 - in /accumulo/trunk: core/pom.xml examples/pom.xml examples/simple/pom.xml examples/wikisearch/ingest/pom.xml examples/wikisearch/pom.xml pom.xml server/pom.xml start/pom.xml trace/pom.xml
Date Thu, 17 May 2012 18:37:48 GMT
Author: vines
Date: Thu May 17 18:37:48 2012
New Revision: 1339784

URL: http://svn.apache.org/viewvc?rev=1339784&view=rev
Log:
ACCUMULO-478 - clean up dupe dependency. Also, formatting fixed

Modified:
    accumulo/trunk/core/pom.xml
    accumulo/trunk/examples/pom.xml
    accumulo/trunk/examples/simple/pom.xml
    accumulo/trunk/examples/wikisearch/ingest/pom.xml
    accumulo/trunk/examples/wikisearch/pom.xml
    accumulo/trunk/pom.xml
    accumulo/trunk/server/pom.xml
    accumulo/trunk/start/pom.xml
    accumulo/trunk/trace/pom.xml

Modified: accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Thu May 17 18:37:48 2012
@@ -15,8 +15,7 @@
   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">
+<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.accumulo</groupId>
@@ -31,12 +30,12 @@
   <build>
     <pluginManagement>
       <plugins>
-	<plugin>
-	  <artifactId>maven-jar-plugin</artifactId>
-	  <configuration>
-	    <outputDirectory>../lib</outputDirectory>
-	  </configuration>
-	</plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <outputDirectory>../lib</outputDirectory>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>

Modified: accumulo/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/examples/pom.xml (original)
+++ accumulo/trunk/examples/pom.xml Thu May 17 18:37:48 2012
@@ -18,9 +18,9 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <artifactId>accumulo</artifactId>
-        <groupId>org.apache.accumulo</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+    <artifactId>accumulo</artifactId>
+    <groupId>org.apache.accumulo</groupId>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-examples</artifactId>
   <packaging>pom</packaging>

Modified: accumulo/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/pom.xml (original)
+++ accumulo/trunk/examples/simple/pom.xml Thu May 17 18:37:48 2012
@@ -15,8 +15,7 @@
   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">
+<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.accumulo</groupId>

Modified: accumulo/trunk/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/ingest/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/ingest/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/ingest/pom.xml Thu May 17 18:37:48 2012
@@ -1,21 +1,21 @@
-<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/xsd/maven-4.0.0.xsd">
-  <!--
-    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.
-  -->
-
+<?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>
     <artifactId>accumulo-wikisearch</artifactId>
@@ -98,4 +98,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
\ No newline at end of file

Modified: accumulo/trunk/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/pom.xml Thu May 17 18:37:48 2012
@@ -18,9 +18,9 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <artifactId>accumulo-examples</artifactId>
-        <groupId>org.apache.accumulo</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+    <artifactId>accumulo-examples</artifactId>
+    <groupId>org.apache.accumulo</groupId>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-wikisearch</artifactId>
   <packaging>pom</packaging>
@@ -222,13 +222,13 @@
         <version>${version.minlog}</version>
       </dependency>
       <dependency>
-    	  <groupId>com.sun.jersey</groupId>
-    	  <artifactId>jersey-server</artifactId>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-server</artifactId>
         <version>1.11</version>
       </dependency>
       <dependency>
-    	  <groupId>com.sun.jersey</groupId>
-    	  <artifactId>jersey-core</artifactId>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
         <version>1.11</version>
       </dependency>
     </dependencies>

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu May 17 18:37:48 2012
@@ -34,7 +34,7 @@
 
   <organization>
     <name>Apache Accumulo Project</name>
-      <url>http://accumulo.apache.org/</url>
+    <url>http://accumulo.apache.org/</url>
   </organization>
 
   <distributionManagement>
@@ -58,11 +58,11 @@
     <extensions>
       <!-- enable ssh deployment of site with maven 3 -->
       <extension>
- 	<groupId>org.apache.maven.wagon</groupId>
- 	<artifactId>wagon-ssh</artifactId>
- 	<version>2.2</version>
-       </extension>
-     </extensions>    
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>2.2</version>
+      </extension>
+    </extensions>
     <defaultGoal>package</defaultGoal>
     <plugins>
       <plugin>
@@ -197,42 +197,42 @@
 
     <pluginManagement>
       <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-            <manifestEntries>
-              <Implementation-Build>${buildNumber}</Implementation-Build>
-              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-	<plugin>
-	  <artifactId>maven-resources-plugin</artifactId>
-	  <version>2.5</version>
-	</plugin>
-	<plugin>
-	  <artifactId>maven-compiler-plugin</artifactId>
-	  <version>2.3.2</version>
-	</plugin>
-	<plugin>
-	  <artifactId>maven-javadoc-plugin</artifactId>
-	  <version>2.8.1</version>
-	</plugin>
-	<plugin>
-	  <artifactId>maven-surefire-plugin</artifactId>
-	  <version>2.12</version>
-	</plugin>
-	<plugin>
-	  <groupId>org.apache.maven.plugins</groupId>
-	  <artifactId>maven-enforcer-plugin</artifactId>
-	  <version>1.0.1</version>
-	</plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              </manifest>
+              <manifestEntries>
+                <Implementation-Build>${buildNumber}</Implementation-Build>
+                <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+              </manifestEntries>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.8.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.12</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.0.1</version>
+        </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.2.1</version>
@@ -242,11 +242,11 @@
           <artifactId>exec-maven-plugin</artifactId>
           <version>1.2.1</version>
         </plugin>
-	<plugin>
-	  <groupId>org.apache.maven.plugins</groupId>
-	  <artifactId>maven-dependency-plugin</artifactId>
-	  <version>2.3</version>
-	</plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
@@ -264,7 +264,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -290,7 +290,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -315,19 +315,19 @@
           <artifactId>rpm-maven-plugin</artifactId>
           <version>2.1-alpha-1</version>
         </plugin>
-	<plugin>
-	  <groupId>org.apache.maven.plugins</groupId>
-	  <artifactId>maven-site-plugin</artifactId>
-	  <version>3.0</version>
-	  <executions>
-          <execution>
-            <id>attach-descriptor</id>
-            <goals>
-              <goal>attach-descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-	</plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0</version>
+          <executions>
+            <execution>
+              <id>attach-descriptor</id>
+              <goals>
+                <goal>attach-descriptor</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -378,23 +378,23 @@
         <version>2.8.1</version>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-project-info-reports-plugin</artifactId>
-	<version>2.4</version>
-	<configuration>
-	  <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-	</configuration>
-	<reportSets>
-	  <reportSet>
-	    <reports>
-	      <report>summary</report>
-	      <report>index</report>
-	      <report>dependencies</report>
-	      <report>issue-tracking</report>
-	      <report>scm</report>
-	    </reports>
-	  </reportSet>
-	</reportSets>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>summary</report>
+              <report>index</report>
+              <report>dependencies</report>
+              <report>issue-tracking</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
     </plugins>
   </reporting>
@@ -541,11 +541,6 @@
         <version>1.5</version>
       </dependency>
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.0.4</version>
-      </dependency>
-      <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <version>1.2</version>
@@ -641,4 +636,4 @@
     <targetJdk>1.6</targetJdk>
   </properties>
 
-</project>
+</project>
\ No newline at end of file

Modified: accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/server/pom.xml (original)
+++ accumulo/trunk/server/pom.xml Thu May 17 18:37:48 2012
@@ -15,8 +15,7 @@
   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">
+<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.accumulo</groupId>
@@ -31,22 +30,22 @@
   <build>
     <pluginManagement>
       <plugins>
-	<plugin>
-	  <artifactId>maven-jar-plugin</artifactId>
-	  <configuration>
-	    <outputDirectory>../lib</outputDirectory>
-          <archive>
-            <manifestSections>
-              <manifestSection>
-                <name>accumulo/server/</name>
-                <manifestEntries>
-                  <Sealed>true</Sealed>
-                </manifestEntries>
-              </manifestSection>
-            </manifestSections>
-          </archive>
-	  </configuration>
-	</plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <outputDirectory>../lib</outputDirectory>
+            <archive>
+              <manifestSections>
+                <manifestSection>
+                  <name>accumulo/server/</name>
+                  <manifestEntries>
+                    <Sealed>true</Sealed>
+                  </manifestEntries>
+                </manifestSection>
+              </manifestSections>
+            </archive>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

Modified: accumulo/trunk/start/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/start/pom.xml (original)
+++ accumulo/trunk/start/pom.xml Thu May 17 18:37:48 2012
@@ -15,8 +15,7 @@
   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">
+<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.accumulo</groupId>
@@ -31,22 +30,22 @@
   <build>
     <pluginManagement>
       <plugins>
-	<plugin>
-	  <artifactId>maven-jar-plugin</artifactId>
-	  <configuration>
-	    <outputDirectory>../lib</outputDirectory>
-          <archive>
-            <manifestSections>
-              <manifestSection>
-                <name>accumulo/start/</name>
-                <manifestEntries>
-                  <Sealed>true</Sealed>
-                </manifestEntries>
-              </manifestSection>
-            </manifestSections>
-          </archive>
-	  </configuration>
-	</plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <outputDirectory>../lib</outputDirectory>
+            <archive>
+              <manifestSections>
+                <manifestSection>
+                  <name>accumulo/start/</name>
+                  <manifestEntries>
+                    <Sealed>true</Sealed>
+                  </manifestEntries>
+                </manifestSection>
+              </manifestSections>
+            </archive>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

Modified: accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1339784&r1=1339783&r2=1339784&view=diff
==============================================================================
--- accumulo/trunk/trace/pom.xml (original)
+++ accumulo/trunk/trace/pom.xml Thu May 17 18:37:48 2012
@@ -15,8 +15,7 @@
   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">
+<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.accumulo</groupId>
@@ -30,12 +29,12 @@
   <build>
     <pluginManagement>
       <plugins>
-	<plugin>
-	  <artifactId>maven-jar-plugin</artifactId>
-	  <configuration>
-	    <outputDirectory>../lib</outputDirectory>
-	  </configuration>
-	</plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <outputDirectory>../lib</outputDirectory>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>



Mime
View raw message