2.0 release

Author: UmanShahzad

.travis.yml

@@ -8,7 +8,7 @@ install:
   - mvn -B install -U
 
 after_success:
-  - util/deploy_snapshot.sh
+#  - util/deploy.sh
   - util/deploy_docs.sh
 
 branches:

pom.xml

@@ -7,12 +7,6 @@
     <version>2.0</version>
     <packaging>jar</packaging>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -39,7 +33,19 @@
         <url>[email protected]:ipinfo/java.git</url>
         <connection>scm:git:[email protected]:ipinfo/java.git</connection>
         <developerConnection>scm:git:[email protected]:ipinfo/java.git</developerConnection>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
+
+    <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>
 
     <developers>
         <developer>
@@ -105,6 +111,17 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.8</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -141,6 +158,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <goals>deploy</goals>
+                </configuration>
+            </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>
         </plugins>
     </build>
 </project>

src/test/java/io/ipinfo/IPinfoTest.java

@@ -228,7 +228,7 @@ public void testGetBatchAsns() {
                     () -> assertEquals(res2.getRegistry(), "arin"),
                     () -> assertEquals(res2.getDomain(), "mail.mil"),
                     () -> assertEquals(res2.getNumIps(), new Integer(66048)),
-                    () -> assertEquals(res2.getType(), "business")
+                    () -> assertEquals(res2.getType(), "isp")
             );
         } catch (RateLimitedException e) {
             fail(e);

util/deploy_snapshot.sh util/deploy.shutil/deploy_snapshot.sh renamed to util/deploy.sh

@@ -6,13 +6,11 @@ function mvn_deploy() {
     mvn clean source:jar javadoc:jar deploy --settings="$(dirname $0)/settings.xml"
 }
 
-
-if [ "$TRAVIS_REPO_SLUG" == "ipinfo/java" ] && \
-   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && \
-   [ "$TRAVIS_PULL_REQUEST" == "false" ] && \
+if [ "$TRAVIS_REPO_SLUG" == "ipinfo/java" ] &&                                \
+   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] &&                               \
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] &&                                   \
    [ "$TRAVIS_BRANCH" == "master" ]; then
   echo "Publishing Maven snapshot..."
-
   mvn_deploy
   echo "Maven snapshot published."
 fi

util/deploy_docs.sh

@@ -2,26 +2,22 @@
 
 set -e -u
 
-
-if [ "$TRAVIS_REPO_SLUG" == "ipinfo/java" ] && \
-   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && \
-   [ "$TRAVIS_PULL_REQUEST" == "false" ] && \
+if [ "$TRAVIS_REPO_SLUG" == "ipinfo/java" ] &&                                \
+   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] &&                               \
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] &&                                   \
    [ "$TRAVIS_BRANCH" == "master" ]; then
   echo "Publishing Javadoc and JDiff..."
   git config --global user.email "[email protected]"
   git config --global user.name "travis-ci"
 
-  cd java-ipinfo/target
+  cd ./target
 
   git clone -q -b gh-pages https://${GH_TOKEN}@github.com/ipinfo/java gh-pages > /dev/null
   cd gh-pages
-
   cp -rf ../apidocs/* .
 
   git add --all
-
   git commit -m "Deploy javadocs to GitHub Pages Travis build: ${TRAVIS_BUILD_NUMBER}" -m "Commit: ${TRAVIS_COMMIT}"
-
   git push -fq origin gh-pages > /dev/null
 
   echo "Javadoc and JDiff published to gh-pages."

util/settings.xml

@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
     <servers>
         <server>
-            <id>sonatype-nexus-snapshots</id>
+            <id>ossrh</id>
             <username>${env.CI_DEPLOY_USERNAME}</username>
             <password>${env.CI_DEPLOY_PASSWORD}</password>
         </server>