From bec5f5575e491b801f6b7eccb4af18ac82216af5 Mon Sep 17 00:00:00 2001
From: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Date: Tue, 8 Mar 2016 18:54:36 -0800
Subject: [PATCH] Prepare for 1.5 release

---
 cli/pom.xml  |  4 +--
 core/pom.xml | 14 ++++-----
 pom.xml      | 83 ++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 166670756..0e6563dd2 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.turn</groupId>
 		<artifactId>ttorrent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5</version>
 	</parent>
 
 	<name>Java BitTorrent library CLI</name>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.turn</groupId>
 			<artifactId>ttorrent-core</artifactId>
-			<version>1.5-SNAPSHOT</version>
+			<version>1.6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index c7f5254ba..5b0e056ef 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.turn</groupId>
 		<artifactId>ttorrent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5</version>
 	</parent>
 
 	<name>Java BitTorrent library core</name>
@@ -27,11 +27,11 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>1.6.4</version>
 		</dependency>
- 		<dependency>
- 			<groupId>org.testng</groupId>
- 			<artifactId>testng</artifactId>
- 			<version>6.1.1</version>
- 			<scope>test</scope>
- 		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>6.1.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 445d945b5..b1b945c8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,6 @@
 <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>
 
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-		<relativePath />
-	</parent>
-
 	<name>Java BitTorrent library</name>
 	<description>
 		ttorrent is a pure-Java implementation of the BitTorrent protocol,
@@ -17,18 +10,18 @@
 	<url>http://mpetazzoni.github.io/ttorrent/</url>
 	<groupId>com.turn</groupId>
 	<artifactId>ttorrent</artifactId>
-	<version>1.5-SNAPSHOT</version>
+	<version>1.5</version>
 	<packaging>pom</packaging>
 
-    <modules>
-        <module>core</module>
-        <module>cli</module>
-    </modules>
+	<modules>
+		<module>core</module>
+		<module>cli</module>
+	</modules>
 
 	<scm>
 		<connection>scm:git:git://github.com/mpetazzoni/ttorrent.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/mpetazzoni/ttorrent.git</developerConnection>
-		<url>http://github.com/mpetazzoni/ttorrent</url>
+		<url>https://github.com/mpetazzoni/ttorrent</url>
 		<tag>master</tag>
 	</scm>
 
@@ -50,8 +43,8 @@
 			<name>Maxime Petazzoni</name>
 			<email>maxime.petazzoni@bulix.org</email>
 			<url>http://www.bulix.org</url>
-			<organization>SignalFuse, Inc</organization>
-			<organizationUrl>http://www.signalfuse.com</organizationUrl>
+			<organization>SignalFx, Inc</organization>
+			<organizationUrl>http://www.signalfx.com</organizationUrl>
 			<roles>
 				<role>maintainer</role>
 				<role>architect</role>
@@ -68,6 +61,17 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+
 	<repositories>
 		<repository>
 			<id>jboss-thirdparty-releases</id>
@@ -88,6 +92,20 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -96,6 +114,29 @@
 					<reportOutputDirectory>${basedir}</reportOutputDirectory>
 					<destDir>doc</destDir>
 				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
@@ -103,6 +144,18 @@
 				<artifactId>maven-release-plugin</artifactId>
 				<version>2.4.2</version>
 			</plugin>
+
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.3</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>ossrh</serverId>
+					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>