accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/6] accumulo git commit: ACCUMULO-4390 Remove directory assembly profile
Date Mon, 25 Jul 2016 19:59:52 GMT
ACCUMULO-4390 Remove directory assembly profile

* Remove another unneeded profile, assembly property.
* Fixup source-release tarball profile so that it gets properly detached
  and renamed with only the apache-release profile activated.
* Fix warnings from native directory assembly about being unable to
  attach.


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

Branch: refs/heads/master
Commit: 5b80b2a4d0977d07117ca00f1c5449c39c9084c9
Parents: 9ad7111
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Jul 25 15:07:08 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Jul 25 15:38:50 2016 -0400

----------------------------------------------------------------------
 assemble/pom.xml                                | 21 ---------------
 assemble/src/main/assemblies/dev-directory.xml  | 27 --------------------
 pom.xml                                         |  4 +++
 server/native/pom.xml                           | 15 +++++++++++
 .../native/src/main/assemblies/native-dir.xml   | 27 ++++++++++++++++++++
 .../src/main/assemblies/native-tarball.xml      |  1 -
 6 files changed, 46 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 4bb937c..6d5b611 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -26,10 +26,6 @@
   <packaging>pom</packaging>
   <name>Apache Accumulo</name>
   <description>Apache Accumulo packages.</description>
-  <properties>
-    <DEV_ACCUMULO_HOME>${project.build.directory}</DEV_ACCUMULO_HOME>
-    <accumulo-top>..</accumulo-top>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>com.beust</groupId>
@@ -265,23 +261,6 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>directory-assembly</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <finalName>${project.build.finalName}</finalName>
-              <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
-              <formats>
-                <format>dir</format>
-              </formats>
-              <descriptors>
-                <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
             <id>binary-assembly</id>
             <goals>
               <goal>single</goal>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/assemble/src/main/assemblies/dev-directory.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/dev-directory.xml b/assemble/src/main/assemblies/dev-directory.xml
deleted file mode 100644
index 1c1de08..0000000
--- a/assemble/src/main/assemblies/dev-directory.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>dev</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <componentDescriptors>
-    <componentDescriptor>src/main/assemblies/component.xml</componentDescriptor>
-  </componentDescriptors>
-</assembly>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9b2168..0f57f62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1254,6 +1254,10 @@
         <skipITs>true</skipITs>
         <skipTests>true</skipTests>
       </properties>
+    </profile>
+    <profile>
+      <!-- set proper source assembly name with apache-release and don't attach here -->
+      <id>apache-release</id>
       <build>
         <pluginManagement>
           <plugins>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index b984110..b524299 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -77,6 +77,21 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
+            <id>assemble-native-directory</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <attach>false</attach>
+              <appendAssemblyId>false</appendAssemblyId>
+              <finalName>${project.build.finalName}</finalName>
+              <descriptors>
+                <descriptor>src/main/assemblies/native-dir.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
             <id>assemble-native-tarball</id>
             <goals>
               <goal>single</goal>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/server/native/src/main/assemblies/native-dir.xml
----------------------------------------------------------------------
diff --git a/server/native/src/main/assemblies/native-dir.xml b/server/native/src/main/assemblies/native-dir.xml
new file mode 100644
index 0000000..52d3245
--- /dev/null
+++ b/server/native/src/main/assemblies/native-dir.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>src</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <componentDescriptors>
+    <componentDescriptor>src/main/assemblies/component.xml</componentDescriptor>
+  </componentDescriptors>
+</assembly>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b80b2a4/server/native/src/main/assemblies/native-tarball.xml
----------------------------------------------------------------------
diff --git a/server/native/src/main/assemblies/native-tarball.xml b/server/native/src/main/assemblies/native-tarball.xml
index 1d1480b..7b3f5c4 100644
--- a/server/native/src/main/assemblies/native-tarball.xml
+++ b/server/native/src/main/assemblies/native-tarball.xml
@@ -19,7 +19,6 @@
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>src</id>
   <formats>
-    <format>dir</format>
     <format>tar.gz</format>
   </formats>
   <componentDescriptors>


Mime
View raw message