Merge branch 'hotfix/0.1.1'

57blocks · Dec 27, 2018 · 3b68833 · 3b68833
2 parents a660fcc + 37f5b53
commit 3b68833
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,42 @@
+language: java
+jdk:
+  - openjdk8
+
+## Build and verify
+install:
+  mvn clean install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
+
+script:
+  mvn clean verify -DskipTests=true -Dmaven.javadoc.skip=false -Dgpg.skip -B -U
+
+## Only build and deploy sms-spring-boot-starter
+before_deploy:
+  - cd $BUILDING_FOLDER
+  - mvn help:evaluate -N -Dexpression=project.version|grep -v '\['
+  - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[')
+  - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
+  - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
+  - mvn --settings .settings.xml clean deploy -DskipTests=false -Dmaven.javadoc.skip=false -B -U
+
+## Create release in Github
+deploy:
+  provider: releases
+  api_key:
+    secure: W4fKOfATeBfOXevAqcjyq7c9fbEQ/7Xyq3zd4OBQxvSCsDQV3tae3GOzu3AjvpyNoMbbzcrDwYwQJm6Oxnud9HVDrh5yQvTEtGii6gqNyKUOjxKYcahjh1gpZg3JS54Z7AjFG+otg7Yrt8KcTy82LyqJ40M5F+DlS6W7FSpwz8eNukIByHYq/Rw+vIHaujL3S2FjsiYuKZG7LlxwXB5mJn2y6agIr08+g4USKCCrVwUXkgqaLOAsob9GxQfmANCFAIo/1XbvyAMJwCfaIMtORxPAkpfheCyX4I2j4yUD26ebYczGST5sRqaJCKobxEZ9MpeJXNx8CkMfBcOXNBk7Mk2LiauOQu/MCzjwv8tJwRfV9lx0oOSuxaSucusxSfrPfvWCmI0Dr3uEZCoDV6yDm1o8J7VtV38ZPghNookCO3gb2UfnghvHY5jZmRETpb+rixXRrj5T7AQqDLnw0Gg4tKonr/gdUH7KlrCuGor924INdiQZTcSlxoDToCjZRRbLC7nAeLDp/3si7zhh59NWCzTHKgrkzHweWSge53lINpR0G8uxdUyToQwkGp9jRLHUgkfbGHKALRwV2MOfOsLO7QTvQScGH3E+faHPQ+ThQ37Oo+/QsS0GWXHdjs2nGT3C3juXUkOvNpwQ2CwhtWh0wFGPHAeA0qm7iMZF/CafTUc=
+  file:
+    - "target/sms-spring-boot-starter-$project_version.jar"
+    - "target/sms-spring-boot-starter-$project_version-javadoc.jar"
+    - "target/sms-spring-boot-starter-$project_version-sources.jar"
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: 57blocks/sms-spring-boot
+  name: $project_version
+
+cache:
+  directories:
+    - ~/.m2/repository
+
+env:
+  global:
+    - BUILDING_FOLDER="`pwd`/sms-spring-boot-starter"
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
+[![Travis-CI](https://travis-ci.org/57blocks/sms-spring-boot.svg?branch=master)](https://travis-ci.org/57blocks/sms-spring-boot)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Maven Central](https://img.shields.io/maven-central/v/io.57blocks/sms-spring-boot-starter.svg)](https://search.maven.org/search?q=a:sms-spring-boot-starter)
 # SMS Spring Boot Starter
 Configure an SMS service ready for sending messages. Supports templating with resource bundles.
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.57blocks</groupId>
   <artifactId>sms-spring-boot</artifactId>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
   <packaging>pom</packaging>
 
   <name>sms-spring-boot</name>

diff --git a/sms-spring-boot-example/pom.xml b/sms-spring-boot-example/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>io.57blocks</groupId>
     <artifactId>sms-spring-boot</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -38,6 +38,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
         <configuration>
           <source>8</source>
           <target>8</target>

diff --git a/sms-spring-boot-example/twilio-sms-example/pom.xml b/sms-spring-boot-example/twilio-sms-example/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.57blocks</groupId>
     <artifactId>sms-spring-boot-example</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>io.57blocks</groupId>
       <artifactId>sms-spring-boot-starter</artifactId>
-      <version>0.1.0</version>
+      <version>0.1.1</version>
     </dependency>
     <dependency>
       <groupId>io.57blocks</groupId>
       <artifactId>twilio-spring-boot-starter</artifactId>
-      <version>0.1.0</version>
+      <version>0.1.1</version>
     </dependency>
   </dependencies>
 
@@ -37,6 +37,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>2.0.7.RELEASE</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/sms-spring-boot-starter/.settings.xml b/sms-spring-boot-starter/.settings.xml
@@ -0,0 +1,24 @@
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/SETTINGS/1.0.0" xsi:schemalocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <!-- Maven Central Deployment -->
+      <id>ossrh</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <id>ossrh</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
+        <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+  </profiles>
+</settings>
diff --git a/sms-spring-boot-starter/pom.xml b/sms-spring-boot-starter/pom.xml
@@ -4,19 +4,56 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>io.57blocks</groupId>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
   <artifactId>sms-spring-boot-starter</artifactId>
+  <packaging>jar</packaging>
+
   <name>sms-spring-boot-starter</name>
   <description>
     sms-spring-boot provide a convenient approach to integrate sms service by pre-defined
     configuration. It supports templating with resource bundle.
   </description>
+  <url>https://github.com/57blocks/sms-spring-boot</url>
+
+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>https://github.com/57blocks/email-spring-boot</url>
+    <connection>scm:git:https://github.com/57blocks/email-spring-boot.git</connection>
+    <developerConnection>scm:git:https://github.com/57blocks/email-spring-boot.git</developerConnection>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Roy Xie</name>
+      <email>[email protected]</email>
+      <url>https://github.com/crazypisces</url>
+    </developer>
+    <developer>
+      <name>Troy Young</name>
+      <email>[email protected]</email>
+      <url>https://github.com/sgyyz</url>
+    </developer>
+  </developers>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
+    <twilio-spring-boot-starter.version>0.1.1</twilio-spring-boot-starter.version>
+
     <gitflow-maven-plugin.version>1.11.0</gitflow-maven-plugin.version>
-    <twilio-spring-boot-starter.version>0.1.0</twilio-spring-boot-starter.version>
+    <java-doc-plugin.version>3.0.1</java-doc-plugin.version>
+    <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+    <nexus-staging-maven-plugin.version>1.6.2</nexus-staging-maven-plugin.version>
+    <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
   </properties>
 
   <dependencies>
@@ -55,9 +92,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
         <configuration>
-          <source>8</source>
-          <target>8</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
       </plugin>
 
@@ -73,7 +111,84 @@
           <commitDevelopmentVersionAtStart>true</commitDevelopmentVersionAtStart>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${java-doc-plugin.version}</version>
+        <configuration>
+          <breakiterator>true</breakiterator>
+          <charset>UTF-8</charset>
+          <docencoding>UTF-8</docencoding>
+          <encoding>UTF-8</encoding>
+          <failOnError>true</failOnError>
+          <show>protected</show>
+          <source>1.8</source>
+          <version>true</version>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>${maven-source-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>${nexus-staging-maven-plugin.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>${maven-gpg-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
+  <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>
+
 </project>