From f2ac02f2e21fe03427e388332ed043b9e10ca5ba Mon Sep 17 00:00:00 2001
From: Wolf Posdorfer <posdorfer@informatik.uni-hamburg.de>
Date: Tue, 30 Jan 2018 12:38:37 +0100
Subject: [PATCH] Revert "Merge branch 'master' into release/0.15"

This reverts commit 340d9f7687538918722b4906f74ca5bb976453fd, reversing
changes made to a90bb33e9019d6f4506db2f4fb04c956161c89a2.
---
 Readme.md             | 30 ------------------------------
 circleci.settings.xml |  4 ----
 pom.xml               |  3 +--
 settings.xml          | 43 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 36 deletions(-)
 create mode 100644 settings.xml

diff --git a/Readme.md b/Readme.md
index f85e332..3875b62 100644
--- a/Readme.md
+++ b/Readme.md
@@ -9,7 +9,6 @@ A Java implementation of the Tendermint Application BlockChain Interface ([ABCI]
 Check out [StartupExampleDummy.java](https://github.com/jTendermint/jabci/blob/master/src/main/java/com/github/jtendermint/jabci/StartupExampleDummy.java) or [JavaCounter.java](https://github.com/jTendermint/jabci/blob/master/src/main/java/com/github/jtendermint/jabci/JavaCounter.java) for examples.
 
 #### Maven integration
-
 jABCI v0.15 Release is now available via maven central. Use the following dependency to include the latest release:
 ```xml
 <dependency>
@@ -19,35 +18,6 @@ jABCI v0.15 Release is now available via maven central. Use the following depend
 </dependency>
 ```
 
-Development will move onto a dedicated `develop` branch in the short term and it's artifacts will be available in Central's snapshot repository
-
-The current snapshot repository is: `https://oss.sonatype.org/content/repositories/snapshots/` which can be used by adding the repository:
-```xml
-      <repository>
-         <id>snapshots-repo</id>
-         <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-         <releases><enabled>false</enabled></releases>
-         <snapshots><enabled>true</enabled></snapshots>
-       </repository>
-```
-
-Use the following dependency to include current version of jABCI in your project:
-```xml
-            <dependency>
-                <groupId>com.github.jtendermint</groupId>
-                <artifactId>jabci</artifactId>
-                <version>0.12.0.2</version>
-                <scope>compile</scope>
-                <!-- you might want to exclude slf4j, depending on your setup -->
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-simple</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-```
-
 #### Update protobuf types
 
 When you make changes to the protobuf file, you can enable the appropriate build-phase for the compiler-plugin to generate the file(s) in the target-directory.
diff --git a/circleci.settings.xml b/circleci.settings.xml
index e88859e..c8679f5 100644
--- a/circleci.settings.xml
+++ b/circleci.settings.xml
@@ -6,9 +6,5 @@
             <username>${env.OSS_SONATYPE_USERNAME}</username>
             <password>${env.OSS_SONATYPE_PASSWORD}</password>
         </server>
-        <server>
-            <id>gpg.passphrase</id>
-            <passphrase>${env.GPG_PASSPHRASE}</passphrase>
-        </server>
     </servers>
 </settings>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index efa7d6c..22a55f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.github.jtendermint</groupId>
     <artifactId>jabci</artifactId>
     <version>0.15</version>
-  
+
     <name>com.github.jtendermint:jabci</name>
     <description>Java implementation for ABCI consensus protocol from tendermint.com and related tools</description>
     <url>http://www.github.com/jtendermint</url>
@@ -146,7 +146,6 @@
             <version>1.7.25</version>
         </dependency>
         <dependency>
-        	<scope>test</scope>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000..4174b86
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,43 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+<servers>
+<server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${env.SONATYPE_USER}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+</server>
+<server>
+    <id>sonatype-nexus-staging</id>
+    <username>${env.SONATYPE_USER}</username>
+    <password>${env.SONATYPE_PASSWORD}</password>
+</server>
+    <server>
+      <id>ossrh</id>
+      <username>${env.SONATYPE_JIRA_USER}</username>
+      <password>${env.SONATYPE_JIRA_PASS}</password>
+    </server>
+</servers>
+ <profiles>
+    <profile>
+      <id>gpg</id>
+      <properties>
+        <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+<profile>
+<id>sonatype-staging</id>
+<repositories>
+<repository>
+<id>sonatype-staging</id>
+<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+<layout>default</layout>
+<releases><enabled>true</enabled></releases>
+</repository>
+</repositories>
+</profile>
+  </profiles>
+ <activeProfiles>
+    <activeProfile>gpg</activeProfile>
+    <activeProfile>sonatype-staging</activeProfile> 
+  </activeProfiles>
+</settings>