accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1481249 - in /accumulo/branches/1.5: assemble/pom.xml assemble/src/main/assemblies/bin.xml assemble/src/main/assemblies/binary-release.xml pom.xml
Date Sat, 11 May 2013 01:45:45 GMT
Author: ctubbsii
Date: Sat May 11 01:45:45 2013
New Revision: 1481249

URL: http://svn.apache.org/r1481249
Log:
ACCUMULO-1404 make maven-release-plugin include the proper files for binary release artifacts,
and rename binary-release tarball to more explicitly describe what it is and to adjust the
baseDirectory to match user expectations from prior releases

Added:
    accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
      - copied, changed from r1481244, accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
Removed:
    accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
Modified:
    accumulo/branches/1.5/assemble/pom.xml
    accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1481249&r1=1481248&r2=1481249&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Sat May 11 01:45:45 2013
@@ -117,7 +117,7 @@
                 <phase>package</phase>
                 <configuration>
                   <descriptors>
-                    <descriptor>src/main/assemblies/bin.xml</descriptor>
+                    <descriptor>src/main/assemblies/binary-release.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>
@@ -169,14 +169,6 @@
                   <classifier>bin</classifier>
                   <provides>
                     <provide>accumulo</provide>
-                    <provide>accumulo-core</provide>
-                    <provide>accumulo-examples</provide>
-                    <provide>accumulo-fate</provide>
-                    <provide>accumulo-proxy</provide>
-                    <provide>accumulo-server</provide>
-                    <provide>accumulo-start</provide>
-                    <provide>accumulo-test</provide>
-                    <provide>accumulo-trace</provide>
                   </provides>
                   <requires>
                     <require>jre</require>
@@ -188,6 +180,9 @@
                       <directory>/opt/accumulo/accumulo-${project.version}</directory>
                       <sources>
                         <source>
+                          <location>${accumulo-top}/CHANGES</location>
+                        </source>
+                        <source>
                           <location>${accumulo-top}/LICENSE</location>
                         </source>
                         <source>
@@ -210,25 +205,6 @@
                       </sources>
                     </mapping>
                     <mapping>
-                      <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
-                      <sources>
-                        <source>
-                          <location>${accumulo-top}/test</location>
-                          <excludes>
-                            <exclude>src/**</exclude>
-                            <exclude>target/**</exclude>
-                            <exclude>**/walkers.txt</exclude>
-                            <exclude>**/ingesters.txt</exclude>
-                            <exclude>**/continuous-env.sh</exclude>
-                            <exclude>.*/**</exclude>
-                            <exclude>**/*.pyc</exclude>
-                            <exclude>**/*.pyo</exclude>
-                            <exclude>pom.xml</exclude>
-                          </excludes>
-                        </source>
-                      </sources>
-                    </mapping>
-                    <mapping>
                       <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
                     </mapping>
                     <mapping>
@@ -245,25 +221,21 @@
                     </mapping>
                     <mapping>
                       <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+                      <recurseDirectories>true</recurseDirectories>
                       <sources>
                         <source>
                           <location>${accumulo-top}/conf</location>
-                          <excludes>
-                            <exclude>${accumulo-top}/**/accumulo-site.xml</exclude>
-                            <exclude>${accumulo-top}/**/accumulo-env.sh</exclude>
-                            <exclude>${accumulo-top}/**/accumulo-metrics.xml</exclude>
-                            <exclude>${accumulo-top}/**/test-*</exclude>
-                            <exclude>${accumulo-top}/**/slaves</exclude>
-                            <exclude>${accumulo-top}/**/masters</exclude>
-                            <exclude>${accumulo-top}/**/tracers</exclude>
-                            <exclude>${accumulo-top}/**/gc</exclude>
-                            <exclude>${accumulo-top}/**/monitor</exclude>
-                          </excludes>
+                          <includes>
+                            <include>accumulo.policy.example</include>
+                            <include>examples/**/*</include>
+                            <include>examples/**/*.*</include>
+                          </includes>
                         </source>
                       </sources>
                     </mapping>
                     <mapping>
                       <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+                      <recurseDirectories>true</recurseDirectories>
                       <sources>
                         <source>
                           <location>${accumulo-top}/lib</location>
@@ -293,7 +265,7 @@
                     <provide>accumulo-native</provide>
                   </provides>
                   <requires>
-                    <require>accumulo-server</require>
+                    <require>accumulo</require>
                   </requires>
                   <mappings>
                     <mapping>
@@ -310,6 +282,45 @@
                   </mappings>
                 </configuration>
               </execution>
+              <execution>
+                <id>build-tests-rpm</id>
+                <goals>
+                  <goal>attached-rpm</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <name>accumulo-test</name>
+                  <classifier>test</classifier>
+                  <provides>
+                    <provide>accumulo-test</provide>
+                  </provides>
+                  <requires>
+                    <require>accumulo</require>
+                    <require>python</require>
+                  </requires>
+                  <mappings>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/test</location>
+                          <excludes>
+                            <exclude>src/**</exclude>
+                            <exclude>target/**</exclude>
+                            <exclude>**/walkers.txt</exclude>
+                            <exclude>**/ingesters.txt</exclude>
+                            <exclude>**/continuous-env.sh</exclude>
+                            <exclude>.*/**</exclude>
+                            <exclude>**/*.pyc</exclude>
+                            <exclude>**/*.pyo</exclude>
+                            <exclude>pom.xml</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -344,7 +355,7 @@
                         <type>perm</type>
                         <prefix>/usr/lib/accumulo/lib</prefix>
                       </mapper>
-                      <excludes>**/.svn/**,**/lib/native/**</excludes>
+                      <excludes>**/.svn/**,native/**</excludes>
                     </data>
                     <data>
                       <src>${accumulo-top}/NOTICE</src>
@@ -371,13 +382,21 @@
                       </mapper>
                     </data>
                     <data>
+                      <src>${accumulo-top}/LICENSE</src>
+                      <type>file</type>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>/usr/lib/accumulo</prefix>
+                      </mapper>
+                    </data>
+                    <data>
                       <src>${accumulo-top}/docs</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/usr/lib/accumulo/docs</prefix>
                       </mapper>
-                      <excludes>**/.svn/**</excludes>
+                      <excludes>**/.svn/**,src/**</excludes>
                     </data>
                     <data>
                       <src>${accumulo-top}/bin</src>
@@ -396,15 +415,7 @@
                         <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>
-                    <data>
-                      <src>${accumulo-top}/conf/examples</src>
-                      <type>directory</type>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>/usr/lib/accumulo/conf/examples</prefix>
-                      </mapper>
+                      <includes>accumulo.policy.example,examples/**</includes>
                       <excludes>**/.svn/**</excludes>
                     </data>
                   </dataSet>
@@ -469,7 +480,7 @@
                         <type>perm</type>
                         <prefix>/usr/lib/accumulo/test</prefix>
                       </mapper>
-                      <excludes>**/.svn/**,**/*.pyc</excludes>
+                      <excludes>**/.svn/**,**/*.pyc,src/**,target/**,**/walkers.txt,**/ingesters.txt,**/continuous-env.sh,.*/**,**/*.pyc,**/*.pyo,pom.xml</excludes>
                     </data>
                   </dataSet>
                 </configuration>

Copied: accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml (from r1481244,
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml?p2=accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml&p1=accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml&r1=1481244&r2=1481249&rev=1481249&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml (original)
+++ accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml Sat May 11 01:45:45
2013
@@ -15,11 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<assembly>
-  <id>bin</id>
+<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>binary-release</id>
   <formats>
     <format>tar.gz</format>
   </formats>
+  <baseDirectory>accumulo-${project.version}</baseDirectory>
   <fileSets>
     <fileSet>
       <directory>../bin</directory>
@@ -27,90 +29,126 @@
       <directoryMode>0755</directoryMode>
     </fileSet>
     <fileSet>
+      <directory>../lib</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../lib/native</directory>
+      <directoryMode>0755</directoryMode>
+      <includes>
+        <include>**/*.so</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../lib/ext</directory>
+      <outputDirectory>/lib/ext</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <excludes>
+        <exclude>*/**</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
       <directory>../logs</directory>
+      <outputDirectory>/logs</outputDirectory>
       <directoryMode>0700</directoryMode>
       <excludes>
-        <exclude>*</exclude>
+        <exclude>*/**</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>../walogs</directory>
-      <directoryMode>0700</directoryMode>
+      <directory>../docs</directory>
+      <directoryMode>0755</directoryMode>
       <excludes>
-        <exclude>*</exclude>
+        <exclude>src/**</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>../</directory>
-      <fileMode>0755</fileMode>
+      <directory>../conf</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>755</fileMode>
       <includes>
-        <include>**/*.py</include>
-        <include>**/*.pl</include>
-        <include>**/*.sh</include>
-        <include>**/*.example</include>
-        <include>**/*.so</include>
+        <include>examples/**/*.sh</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../conf</directory>
+      <directoryMode>0755</directoryMode>
+      <includes>
+        <include>accumulo.policy.example</include>
+        <include>examples/**</include>
       </includes>
       <excludes>
-        <exclude>**/target</exclude>
-        <exclude>conf/accumulo-env.sh</exclude>
-        <exclude>**/continuous-env.sh</exclude>
-        <exclude>**bin/**</exclude>
-        <exclude>logs/**</exclude>
-        <exclude>walogs/**</exclude>
-        <exclude>**.*</exclude>
+        <exclude>examples/**/*.sh</exclude>
       </excludes>
     </fileSet>
-    <!-- Lift generated thrift proxy code into its own directory -->
     <fileSet>
-      <directory>../proxy/target</directory>
-      <fileMode>0644</fileMode>
+      <directory>../test</directory>
       <directoryMode>0755</directoryMode>
-      <outputDirectory>proxy/thrift</outputDirectory>
+      <fileMode>0755</fileMode>
       <includes>
-        <include>gen-cpp/**</include>
-        <include>gen-java/**</include>
-        <include>gen-py/**</include>
-        <include>gen-rb/**</include>
+        <include>**/*.sh</include>
+        <include>**/*.py</include>
+        <include>**/*.pl</include>
       </includes>
       <excludes>
-        <exclude>*</exclude>
+        <exclude>src/**</exclude>
+        <exclude>target/**</exclude>
+        <exclude>**/continuous-env.sh</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>../</directory>
+      <directory>../test</directory>
+      <directoryMode>0755</directoryMode>
       <excludes>
-        <!-- the following ignored because they were included above -->
+        <exclude>**/.*/**</exclude>
+        <exclude>pom.xml</exclude>
+        <exclude>src/**</exclude>
+        <exclude>target/**</exclude>
+        <exclude>**/*.sh</exclude>
         <exclude>**/*.py</exclude>
         <exclude>**/*.pl</exclude>
-        <exclude>**/*.sh</exclude>
-        <exclude>walogs/**</exclude>
-        <exclude>logs/**</exclude>
-        <exclude>bin/**</exclude>
-        <!-- the following directories ignored because they should not be in 
-          the tarball -->
-        <exclude>**/.*/**</exclude>
-        <exclude>**/target/**</exclude>
-
-        <!-- the following files ignored because they should not be in the tarball -->
-        <exclude>**/.*</exclude>
-        <exclude>conf/accumulo-site.xml</exclude>
-        <exclude>conf/accumulo-metrics.xml</exclude>
-        <exclude>**/test-*</exclude>
-        <exclude>conf/slaves</exclude>
-        <exclude>conf/masters</exclude>
-        <exclude>conf/monitor</exclude>
-        <exclude>conf/tracers</exclude>
-        <exclude>conf/gc</exclude>
+        <exclude>**/*.pyc</exclude>
+        <exclude>**/*.pyo</exclude>
         <exclude>**/walkers.txt</exclude>
         <exclude>**/ingesters.txt</exclude>
-        <exclude>**/*.pyc</exclude>
         <exclude>**/randomwalk/conf/logger.xml</exclude>
         <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
         <exclude>**/randomwalk/conf/walkers</exclude>
       </excludes>
-      <fileMode>0644</fileMode>
+    </fileSet>
+    <!-- Lift generated thrift proxy code into its own directory -->
+    <fileSet>
+      <directory>../proxy/target</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <outputDirectory>proxy/thrift</outputDirectory>
+      <includes>
+        <include>gen-cpp/**</include>
+        <include>gen-java/**</include>
+        <include>gen-py/**</include>
+        <include>gen-rb/**</include>
+      </includes>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>../CHANGES</source>
+    </file>
+    <file>
+      <source>../LICENSE</source>
+    </file>
+    <file>
+      <source>../NOTICE</source>
+    </file>
+    <file>
+      <source>../README</source>
+    </file>
+  </files>
 </assembly>

Modified: accumulo/branches/1.5/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1481249&r1=1481248&r2=1481249&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Sat May 11 01:45:45 2013
@@ -106,23 +106,14 @@
   <properties>
     <!-- used for filtering the java source with the current version -->
     <accumulo.release.version>${project.version}</accumulo.release.version>
-    <!-- arguments for the release plugin goals;
-         these are in addition to apache-release defined in the parent POM -->
-    <arguments>-P seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
-    <!-- only prompt once for the next version -->
-    <autoVersionSubmodules>true</autoVersionSubmodules>
     <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
     <maven.min-version>3.0.4</maven.min-version>
     <powermock.version>1.5</powermock.version>
-    <!-- for the release plugin -->
-    <preparationGoals>clean compile javadoc:aggregate install</preparationGoals>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sealJars>false</sealJars>
     <!-- include the tarball, as well as the zip, for the Apache source-release artifact
-->
     <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
-    <!-- stage the RC in the tags directory -->
-    <tagNameFormat>@{project.version}-RC</tagNameFormat>
     <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures
3.3.x compatibility. -->
     <zookeeper.version>3.3.6</zookeeper.version>
   </properties>
@@ -335,6 +326,7 @@
           <configuration>
             <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
             <lineSeparator>\n</lineSeparator>
+            <expandEmptyElements>false</expandEmptyElements>
             <nrOfIndentSpace>2</nrOfIndentSpace>
             <sortDependencies>scope,groupId,artifactId</sortDependencies>
             <sortProperties>true</sortProperties>
@@ -429,6 +421,18 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <arguments>-P apache-release,seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+            <autoVersionSubmodules>true</autoVersionSubmodules>
+            <goals>clean compile javadoc:aggregate deploy</goals>
+            <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+            <tagNameFormat>@{project.version}-RC</tagNameFormat>
+            <useReleaseProfile>false</useReleaseProfile>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
             <skipDeploy>true</skipDeploy>
@@ -502,7 +506,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -515,7 +519,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -528,7 +532,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -541,7 +545,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -554,7 +558,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>



Mime
View raw message