Merge branch 'release/1.0.5-M3' into develop

Makefile.package

@@ -77,13 +77,6 @@ test:
 	ssh $(AMD_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)"
 
 release:
-	mvn release:prepare
-	mvn release:perform
-
-release-xerial:
-	mvn release:perform -Dtag=snappy-java-$(VERSION)
-
-release-sourceforge:
-	mvn release:perform -Darguments="-P sourceforge" -Dtag=snappy-java-$(VERSION)
+	mvn deploy -DperformRelease=true
 
 

pom.xml

@@ -1,9 +1,10 @@
-<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">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xerial.snappy</groupId>
     <artifactId>snappy-java</artifactId>
-  <version>1.0.5-M3-SNAPSHOT</version>
+    <version>1.0.5-M3</version>
     <name>Snappy for Java</name>
     <description>snappy-java: A fast compression/decompression library</description>
     <packaging>bundle</packaging>
@@ -92,6 +93,12 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -248,7 +255,6 @@
     </profiles>
 
 
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>