Author: ctubbsii
Date: Fri May 17 20:02:43 2013
New Revision: 1483966
URL: http://svn.apache.org/r1483966
Log:
ACCUMULO-1413 properly built the source-release tarball with the preferred
naming convention
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/server/src/main/c++/nativeMap/Makefile
Modified: accumulo/branches/1.5/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1483966&r1=1483965&r2=1483966&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri May 17 20:02:43 2013
@@ -102,6 +102,34 @@
</build>
<profiles>
<profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source-release-assembly</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>${project.parent.build.directory}/${project.artifactId}-${project.version}-src.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>src</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>assemble</id>
<build>
<plugins>
@@ -117,6 +145,7 @@
<phase>package</phase>
<configuration>
<attach>true</attach>
+
<finalName>${project.artifactId}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assemblies/binary-release.xml</descriptor>
</descriptors>
Modified: accumulo/branches/1.5/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1483966&r1=1483965&r2=1483966&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri May 17 20:02:43 2013
@@ -112,8 +112,6 @@
<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>
<!-- 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>
@@ -746,23 +744,51 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+
<artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
- <id>attach-source-release-assembly</id>
+ <id>source-release-assembly</id>
<goals>
- <goal>attach-artifact</goal>
+ <goal>single</goal>
</goals>
+ <phase>validate</phase>
<configuration>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <artifacts>
- <artifact>
-
<file>${project.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz</file>
- <type>tar.gz</type>
- <classifier>src</classifier>
- </artifact>
- </artifacts>
+ <finalName>accumulo-${project.version}</finalName>
+ <descriptorRefs>
+ <descriptorRef>source-release-zip-tar</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rename-source-release-assembly</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <executable>mv</executable>
+
<workingDirectory>${project.build.directory}</workingDirectory>
+ <commandlineArgs>-n
accumulo-${project.version}-source-release.tar.gz
accumulo-${project.version}-src.tar.gz</commandlineArgs>
+ <successCodes>
+ <successCode>0</successCode>
+ <successCode>1</successCode>
+ </successCodes>
</configuration>
</execution>
</executions>
Modified: accumulo/branches/1.5/server/src/main/c++/nativeMap/Makefile
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1483966&r1=1483965&r2=1483966&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/branches/1.5/server/src/main/c++/nativeMap/Makefile Fri May 17
20:02:43 2013
@@ -55,7 +55,7 @@ all : $(INSTALLED_LIBS)
clean:
rm -f $(INSTALLED_LIBS) $(LIBS)
-org_apache_accumulo_server_tabletserver_NativeMap.h :
../../../../../lib/accumulo-server.jar
+org_apache_accumulo_server_tabletserver_NativeMap.h :
javah -classpath ../../../../../lib/accumulo-server.jar
org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
