diff --git a/.gitignore b/.gitignore index bf7311174..e2a23af44 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # IntelliJ # User-specific stuff: +.idea .idea/workspace.xml .idea/tasks.xml .idea/findbugs-idea.xml @@ -21,6 +22,7 @@ .idea/shelf *.iws *.ipr +*.iml # Sensitive or high-churn files: .idea/dataSources.ids .idea/dataSources.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 8e283d75b..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ews-java-api \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index ddacdf3e8..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index be026393d..000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf337..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 74c0d0a52..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml deleted file mode 100644 index 6c9fc331c..000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml deleted file mode 100644 index fd35ca452..000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml deleted file mode 100644 index a66d03944..000000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b329..000000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_8.xml b/.idea/libraries/Maven__joda_time_joda_time_2_8.xml deleted file mode 100644 index f973fdc27..000000000 --- a/.idea/libraries/Maven__joda_time_joda_time_2_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d41104174..000000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml deleted file mode 100644 index 78cfcd37a..000000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml deleted file mode 100644 index bfee5185a..000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml deleted file mode 100644 index 24a6857d2..000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml deleted file mode 100644 index 56193163f..000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc112..000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml deleted file mode 100644 index a5237036c..000000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml deleted file mode 100644 index 7ab319b64..000000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml deleted file mode 100644 index 5aeb229ec..000000000 --- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index 411efc600..000000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d1297649f..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e9b29f758..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f82..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.travis.yml b/.travis.yml index f9a9cf069..063139190 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,4 +51,5 @@ before_install: - chmod +x ./deploy_snapshot.sh after_success: + - bash <(curl -s https://codecov.io/bash) - ./deploy_snapshot.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d6bc079ca..9be0ef785 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,57 +1,4 @@ -## Contributing to Exchange Web Services Java API -*ews-java-api* is released under the [MIT License](license.txt) and contributors are welcome. +## Contributing.md -There are several ways to contribute to the project: - -* Report bugs and features in the [issue tracker](https://github.com/officedev/ews-java-api/issues). -* Submit and review pull requests -* Help with documentation -* Help with testing - -GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit. - -### Contributing code and content -Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: - -* [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza -* [Don't "Push" Your Pull Requests](http://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. - -### Coding Conventions -The project is using the _google-styleguide for Java_. Documentation of this style can be found here: [Google Java Style](https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html) - -#### Using IntelliJ -`Settings` -> `Code Style` -> `Scheme` -> _Choose_ `Project` -#### Using Eclipse -* Open *google-styleguide for Java* by clicking on: [google-styleguide](https://google-styleguide.googlecode.com/svn-history/r122/trunk/eclipse-java-google-style.xml) -* Download the file with: “Right click and save as” -* Import the new formatter: - `Window` -> `Preferences` -> `Java` -> `Code Style` -> `Formatter` -> _Choose_ `Import` and `select` the _eclipse-java-google-style.xml_ - -### Pull Requests -If you don't know what a pull request is read the "[Using pull requests](https://help.github.com/articles/using-pull-requests)" article. - -Some guidelines for pull requests: - -* Use a descriptive title and description. -* Include a single logical change. -* Base on master branch - once accepted, can be ported to stable branches. -* Should cleanly merge with target branch. - -### Sign the Contributor License Agreement (CLA) -Before your pull request can be accepted and merged to the main repository you need to sign the [Contributor License Agreement (CLA)](https://cla.azure.com). - -### Commit Messages -1. Separate subject from body with a blank line -2. Limit the subject line to 50 characters -3. Capitalize the subject line -4. Do not end the subject line with a period -5. Use the imperative mood in the subject line (e.g. Fix #123: Make pigs fly). -6. Wrap the body at 72 characters -7. Use the body to explain what and why. The how should be mostly covered by the diff. - -References: - -* [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/) -* [A Note About Git Commit Messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) -* [Guidelines for Commit Messages](https://wiki.gnome.org/Git/CommitMessages) -* [On commit messages](http://who-t.blogspot.de/2009/12/on-commit-messages.html) +### To participate, please visit the project wiki for more information. +*Guidelines can be found* [**HERE**](https://github.com/OfficeDev/ews-java-api/wiki/Contributing) \ No newline at end of file diff --git a/deploy_snapshot.sh b/deploy_snapshot.sh index 6d9ffd47f..09f13b0c5 100644 --- a/deploy_snapshot.sh +++ b/deploy_snapshot.sh @@ -25,8 +25,6 @@ if [ "$TRAVIS_REPO_SLUG" != "OfficeDev/ews-java-api" ]; then echo "[DEPLOY] Skipping snapshot deployment for repo:'$TRAVIS_REPO_SLUG'." elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "[DEPLOY] Skipping snapshot deployment for a pull request." -elif [ "$TRAVIS_BRANCH" != "master" ]; then - echo "[DEPLOY] Skipping snapshot deployment for branch:'$TRAVIS_BRANCH'." elif [ "$TRAVIS_SECURE_ENV_VARS" == "false" ]; then echo "[DEPLOY] Skipping snapshot deployment due to TRAVIS_SECURE_ENV_VARS is set to '$TRAVIS_SECURE_ENV_VARS'." elif [ "$TRAVIS_JDK_VERSION" != "oraclejdk7" ]; then @@ -38,10 +36,10 @@ else # deploy if [ -z "${GPG_PASSPHRASE+xxx}" ]; then echo "[INFO] Deploying unsigned artifacts" - mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true + mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true else echo "[INFO] Deploying signed artifacts" - mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE + mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE fi # clean up rm -f $HOME/.m2/settings.xml diff --git a/ews-java-api.iml b/ews-java-api.iml deleted file mode 100644 index 4dc09d843..000000000 --- a/ews-java-api.iml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 54c06edaa..e303359bc 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ com.microsoft.ews-java-api ews-java-api - 2.0-SNAPSHOT + 2.1-SNAPSHOT Exchange Web Services Java API Exchange Web Services (EWS) Java API @@ -53,6 +53,25 @@ http://www.microsoft.com/ + + + vboctor + Victor Boctor + vboctor@users.noreply.github.com + http://www.github.com/officedev/ews-java-api + Microsoft + http://www.microsoft.com + + administrator + developer + + America/New_York + + http://www.example.com/jdoe/pic + + + + @@ -61,6 +80,7 @@ + 2.16 1.6 2.10.3 3.3 @@ -74,12 +94,14 @@ 2.2 2.5 2.18.1 + 0.7.5.201505241946 4.4.1 4.4.1 1.2 2.8 3.4 + 2.4 4.12 1.3 @@ -99,6 +121,34 @@ -Xdoclint:none + + + java-7-or-later-profile + + [1.7,) + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + true + google_checks.xml + + + + verify + + checkstyle + + + + + + + release-sign-artifacts @@ -175,6 +225,12 @@ ${httpcore.version} + + commons-io + commons-io + ${commons-io.version} + + commons-logging commons-logging @@ -248,6 +304,8 @@ true + ossrh + https://oss.sonatype.org/ @@ -311,6 +369,26 @@ + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + +