You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/03/01 16:53:54 UTC

svn commit: r1295638 - /incubator/accumulo/trunk/pom.xml

Author: vines
Date: Thu Mar  1 15:53:53 2012
New Revision: 1295638

URL: http://svn.apache.org/viewvc?rev=1295638&view=rev
Log:
Fixes ACCUMULO-437 - bad merge left deb building stuff in the base pom


Modified:
    incubator/accumulo/trunk/pom.xml

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1295638&r1=1295637&r2=1295638&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Thu Mar  1 15:53:53 2012
@@ -199,170 +199,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>jdeb</artifactId>
-        <groupId>org.vafer</groupId>
-        <version>0.10</version>
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <id>accumulo</id>
-            <phase>install</phase>
-            <goals>
-              <goal>jdeb</goal>
-            </goals>
-            <configuration>
-              <deb>${project.build.directory}/${artifactId}_${project.version}.deb</deb>
-              <attach>false</attach>
-              <controlDir>src/packages/deb/accumulo</controlDir>
-              <installDir>/usr/lib/accumulo</installDir>
-              <dataSet>
-                <data>
-                  <src>lib</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/lib</prefix>
-                  </mapper>
-                  <excludes>**/.svn/**</excludes>
-                </data>
-                <data>
-                  <src>NOTICE</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                  <prefix>/usr/lib/accumulo</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>DISCLAIMER</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                  <prefix>/usr/lib/accumulo</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>NOTICE</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                  <prefix>/usr/lib/accumulo</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>CHANGES</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                  <prefix>/usr/lib/accumulo</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>README</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                  <prefix>/usr/lib/accumulo</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>docs</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/docs</prefix>
-                  </mapper>
-                  <excludes>**/.svn/**</excludes>
-                </data>
-                <data>
-                  <src>bin</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/bin</prefix>
-                    <filemode>755</filemode>
-                  </mapper>
-                  <excludes>**/.svn/**</excludes>
-                </data>
-                <data>
-                  <src>conf</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/conf</prefix>
-                  </mapper>
-                  <excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes>
-                </data>
-              </dataSet>
-            </configuration>
-          </execution>
-          <execution>
-            <id>accumulo-native</id>
-            <phase>install</phase>
-            <goals>
-              <goal>jdeb</goal>
-            </goals>
-            <configuration>
-              <attach>false</attach>
-              <controlDir>src/packages/deb/accumulo-native</controlDir>
-              <installDir>/usr/lib/accumulo</installDir>
-              <deb>${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb</deb>
-              <dataSet>
-                <data>
-                  <src>src/server/src/main/c++</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/src/server/src/main/c++</prefix>
-                  </mapper>
-                  <excludes>**/.svn/**</excludes>
-                </data>
-                <data>
-                  <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix>
-                  </mapper>
-                </data>
-                <data>
-                  <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src>
-                  <type>file</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix>
-                  </mapper>
-                </data>
-              </dataSet>
-            </configuration>
-          </execution>
-          <execution>
-            <id>accumulo-test</id>
-            <phase>install</phase>
-            <goals>
-              <goal>jdeb</goal>
-            </goals>
-            <configuration>
-              <attach>false</attach>
-              <controlDir>src/packages/deb/accumulo-test</controlDir>
-              <installDir>/usr/lib/accumulo</installDir>
-              <deb>${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb</deb>
-              <dataSet>
-                <data>
-                  <src>test</src>
-                  <type>directory</type>
-                  <mapper>
-                    <type>perm</type>
-                    <prefix>/usr/lib/accumulo/test</prefix>
-                  </mapper>
-                  <excludes>**/.svn/**,**/*.pyc</excludes>
-                </data>
-              </dataSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>