OfficeDev · skunjadia · Nov 5, 2018 · Nov 5, 2018 · Nov 5, 2018 · Nov 5, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,39 @@
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/openjdk:11-jdk
+
+    working_directory: ~/repo
+
+    environment:
+      # Customize the JVM maximum heap limit
+      MAVEN_OPTS: -Xmx3200m
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "pom.xml" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run: mvn dependency:go-offline
+
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: v1-dependencies-{{ checksum "pom.xml" }}
+
+      # deploy
+      - run: >
+          if [ "${CIRCLE_BRANCH}" = 'master' ] ; then
+            echo "${MAVEN_CENTRAL_GPG_KEY}" | base64 --decode | gpg --import --no-tty --batch --yes
+            mvn deploy -s .circleci/settings.xml -Dgpg.passphrase="${MAVEN_CENTRAL_GPG_PASSPHRASE}"
+          else
+            mvn package
+          fi
+
diff --git a/.circleci/settings.xml b/.circleci/settings.xml
@@ -0,0 +1,14 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>ossrh-snapshot</id>
+      <username>surevine</username>
+      <password>${env.MAVEN_CENTRAL_PASSWORD}</password>
+    </server>
+    <server>
+      <id>ossrh</id>
+      <username>surevine</username>
+      <password>${env.MAVEN_CENTRAL_PASSWORD}</password>
+    </server>
+ </servers>
+</settings>
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/pom.xml b/pom.xml
@@ -28,10 +28,10 @@
          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>com.microsoft.ews-java-api</groupId>
+    <groupId>com.surevine</groupId>
     <artifactId>ews-java-api</artifactId>
 
-    <version>2.1-SNAPSHOT</version>
+    <version>2.16-SNAPSHOT</version>
 
     <name>Exchange Web Services Java API</name>
     <description>Exchange Web Services (EWS) Java API</description>
@@ -49,8 +49,8 @@
     </prerequisites>
 
     <organization>
-        <name>Microsoft</name>
-        <url>http://www.microsoft.com/</url>
+        <name>Surevine</name>
+        <url>https://www.surevine.com/</url>
     </organization>
 
     <developers>
@@ -76,32 +76,33 @@
         <!-- Eliminates the file encoding warning. Of course, all of your files
             should probably be UTF-8 nowadays. -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javaLanguage.version>1.6</javaLanguage.version>
+        <javaLanguage.version>1.8</javaLanguage.version>
         <javadoc.doclint.param/>
 
         <!--  Dependencies [BUILD]:  -->
-        <maven-checkstyle-plugin.version>2.16</maven-checkstyle-plugin.version>
+        <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
-        <maven-source-plugin.version>2.4</maven-source-plugin.version>
-        <animal-sniffer-maven-plugin.version>1.14</animal-sniffer-maven-plugin.version>
+        <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+        <animal-sniffer-maven-plugin.version>1.17</animal-sniffer-maven-plugin.version>
         <animal-sniffer-maven-plugin.signature.version>1.1</animal-sniffer-maven-plugin.signature.version>
         <!--  Dependencies [REPORT]:  -->
-        <maven-site-plugin.version>3.4</maven-site-plugin.version>
-        <maven-project-info-reports-plugin.version>2.8</maven-project-info-reports-plugin.version>
-        <versions-maven-plugin.version>2.2</versions-maven-plugin.version>
-        <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
-        <maven-surefire-report-plugin.version>2.18.1</maven-surefire-report-plugin.version>
-        <jacoco-maven-plugin.version>0.7.5.201505241946</jacoco-maven-plugin.version>
+        <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
+        <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
+        <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
+        <maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
+        <maven-surefire-report-plugin.version>2.22.1</maven-surefire-report-plugin.version>
+        <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
         <!--  Dependencies [COMPILE]:  -->
-        <httpclient.version>4.4.1</httpclient.version>
-        <httpcore.version>4.4.1</httpcore.version>
+        <httpclient.version>4.5.6</httpclient.version>
+        <httpcore.version>4.4.10</httpcore.version>
         <commons-logging.version>1.2</commons-logging.version>
-        <joda-time.version>2.8</joda-time.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
-        <commons-io.version>2.4</commons-io.version>
+        <joda-time.version>2.10.1</joda-time.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-io.version>2.5</commons-io.version>
+        <jaxws-api.version>2.3.1</jaxws-api.version>
         <!--  Dependencies [TEST]:  -->
         <junit.version>4.12</junit.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
@@ -171,6 +172,12 @@
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -249,6 +256,12 @@
             <version>${joda-time.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>${jaxws-api.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -323,6 +336,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
+                    <source>8</source> 
                     <linksource>true</linksource>
                     <additionalparam>${javadoc.doclint.param}</additionalparam>
                 </configuration>
@@ -348,7 +362,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!-- <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
                 <version>${animal-sniffer-maven-plugin.version}</version>
@@ -368,7 +382,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
 
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -433,15 +447,15 @@
             </plugin>
 
             <!-- Generates the Javadoc for the report. -->
-            <plugin>
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
                     <linksource>true</linksource>
                     <additionalparam>${javadoc.doclint.param}</additionalparam>
                 </configuration>
-            </plugin>
+            </plugin> -->
 
             <!-- Generates a nice HTML linked source cross-reference. -->
             <plugin>

diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 
 [![Gitter](https://badges.gitter.im/JoinChat.svg)](https://gitter.im/OfficeDev/ews-java-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://travis-ci.org/OfficeDev/ews-java-api.svg)](https://travis-ci.org/OfficeDev/ews-java-api) [![codecov.io](https://codecov.io/github/OfficeDev/ews-java-api/coverage.svg?branch=master)](https://codecov.io/github/OfficeDev/ews-java-api?branch=master)
+![CircleCI branch](https://img.shields.io/circleci/project/github/surevine/ews-java-api/master.svg) ![Maven Central](https://img.shields.io/maven-central/v/com.surevine/ews-java-api.svg) [![codecov.io](https://codecov.io/github/surevine/ews-java-api/coverage.svg?branch=master)](https://codecov.io/github/surevine/ews-java-api?branch=master)
 
 The Exchange Web Services (EWS) Java API provides a managed interface for developing Java applications that use EWS.
 By using the EWS Java API, you can access almost all the information stored in an Office 365, Exchange Online, or Exchange Server mailbox. However, this API is in sustaining mode, the recommended access pattern for Office 365 and Exchange online data is [Microsoft Graph](https://graph.microsoft.com)

diff --git a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java
@@ -213,7 +213,7 @@ public String getOwnerSmtpAddress() {
   /**
    * Sets the owner SMTP address.
    *
-   * @param ownerSmtpAdress the new owner SMTP address
+   * @param ownerSmtpAddress the new owner SMTP address
    */
   protected void setOwnerSmtpAddress(final String ownerSmtpAddress) {
     this.ownerSmtpAddress = ownerSmtpAddress;

diff --git a/src/main/java/microsoft/exchange/webservices/data/core/EwsSSLProtocolSocketFactory.java b/src/main/java/microsoft/exchange/webservices/data/core/EwsSSLProtocolSocketFactory.java
@@ -44,7 +44,9 @@
  * you are perfectly aware of security implications of accepting
  * self-signed certificates
  * </p>
+ * <p>
  * Example of using custom protocol socket factory for a specific host:
+ * </p>
  * <pre>
  *     Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
  *
@@ -55,19 +57,18 @@
  *     hc.setHost(uri.getHost(), uri.getPort(), easyhttps);
  *     HttpClient client = new HttpClient();
  *     client.executeMethod(hc, httpget);
- *     </pre>
- * </p>
+ * </pre>
  * <p>
  * Example of using custom protocol socket factory per default instead of the standard one:
+ * </p>
  * <pre>
  *     Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
  *     Protocol.registerProtocol("https", easyhttps);
  *
  *     HttpClient client = new HttpClient();
  *     GetMethod httpget = new GetMethod("https://localhost/");
  *     client.executeMethod(httpget);
- *     </pre>
- * </p>
+ * </pre>
  *
  * <p>
  * DISCLAIMER: HttpClient developers DO NOT actively support this component.

diff --git a/src/main/java/microsoft/exchange/webservices/data/core/EwsXmlReader.java b/src/main/java/microsoft/exchange/webservices/data/core/EwsXmlReader.java
@@ -561,16 +561,7 @@ public byte[] readBase64ElementValue()
       throws ServiceXmlDeserializationException, XMLStreamException,
       IOException {
     this.ensureCurrentNodeIsStartElement();
-
-    byte[] buffer = null;
-
-    ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-
-    buffer = Base64.decodeBase64(this.xmlReader.getElementText().toString());
-    byteArrayStream.write(buffer);
-
-    return byteArrayStream.toByteArray();
-
+    return Base64.decodeBase64(this.xmlReader.getElementText());
   }
 
   /**
@@ -583,8 +574,7 @@ public void readBase64ElementValue(OutputStream outputStream)
       throws Exception {
     this.ensureCurrentNodeIsStartElement();
 
-    byte[] buffer = null;
-    buffer = Base64.decodeBase64(this.xmlReader.getElementText().toString());
+    byte[] buffer = Base64.decodeBase64(this.xmlReader.getElementText());
     outputStream.write(buffer);
     outputStream.flush();
   }