Merge branch 'release/1.1.0' into develop

Milestone.md

@@ -2,8 +2,11 @@
   * `SnappyIndexer` for parallel compression/decompression
   * CUI commands (snap/unsnap)
 
-## snappy-java-1.1.0  (TBD)
-  * Add FreeBSD support
+## snappy-java-1.1.0  (17 October 2013)
+  * Add Snappy framed format support (SnappyFramedInputStream, SnappyFramedOutputStream)
+  * Add SunOS support
+  * Dropped OpenBSD support
+  * OSGi support
 
 ## snappy-java-1.1.0-M4 (20 August 2013)
   * New JNI native code loading mechanism, which does not rely on native code injection.

README.md

@@ -25,7 +25,7 @@ The snappy-java is a Java port of the snappy
 ## Download 
 The current stable version is available from here:
   * Release version: http://code.google.com/p/snappy-java/downloads/list
-     * [Release plans](https://github.com/xerial/snappy-java/blob/develop/Milestone.md) 
+     * [Release plans](Milestone.md) 
   * Snapshot version (the latest beta version): https://oss.sonatype.org/content/repositories/snapshots/org/xerial/snappy/snappy-java/
 If you are a Maven user, see [pom.xml example](#using-with-maven).
 
@@ -54,7 +54,7 @@ In addition, high-level methods (`Snappy.compress(String)`, `Snappy.compress(flo
 ### Stream-based API
 Stream-based compressor/decompressor `SnappyOutputStream`/`SnappyInputStream` are also available for reading/writing large data sets.
 
- * [Javadoc API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/xerial/snappy/snappy-java/1.1.0-M4/snappy-java-1.1.0-M4-javadoc.jar/!/index.html)
+ * [Javadoc API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/xerial/snappy/snappy-java/1.1.0/snappy-java-1.1.0-javadoc.jar/!/index.html)
 
 ### Setting classpath
 If you have snappy-java-(VERSION).jar in the current directory, use `-classpath` option as follows:

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xerial.snappy</groupId>
     <artifactId>snappy-java</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <name>Snappy for Java</name>
     <description>snappy-java: A fast compression/decompression library</description>
     <packaging>bundle</packaging>
@@ -281,30 +281,6 @@
         <url>git@github.com:xerial/snappy-java.git</url>
     </scm>
 
-    <profiles>
-        <!-- for local updates -->
-        <profile>
-            <id>xerial.local</id>
-            <distributionManagement>
-                <repository>
-                    <id>xerial.local</id>
-                    <name>Xerial Maven Repository</name>
-                    <url>file:///home/web/maven.xerial.org/repository/artifact</url>
-                </repository>
-                <snapshotRepository>
-                    <id>xerial.local</id>
-                    <name>Xerial Maven Snapshot Repository</name>
-                    <url>file:///home/web/maven.xerial.org/repository/snapshot</url>
-                    <uniqueVersion>false</uniqueVersion>
-                </snapshotRepository>
-                <site>
-                    <id>xerial.local</id>
-                    <url>file:///home/web/maven.xerial.org/repository/site</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>