diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 65b9122..0000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: java -jdk: -- oraclejdk8 -cache: - directories: - - "$HOME/.m2" -install: true -script: "mvn -B -U clean install" diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 480e18e..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,71 +0,0 @@ -CHANGELOG -========= - -0.5.1 ------ - -* Bump mon from 0.12.0 to 2.0.0 (#38)(#41)(#43) -* Bump mockito-core from 2.21.0 to 2.23.0 (#36)(#40) -* Bump kemitix-parent from 5.1.1 to 5.2.0 (#39) - -0.5.0 ------ - -* Compatible with Java 10 -* Bump kemitix-parent from 1.1.0 to 5.1.1 -* Use kemitix-checkstyle-ruleset 4.1.1 -* Don't throw generic exceptions -* Add mon 0.12.0 as dependency -* Bump tiles-maven-plugin from 2.11 to 2.12 -* [testing] Use a free port for test mail server -* [testing] Bump mockito-core from 1.10.19 to 2.21.0 -* [testing] Bump spring-context-support from 4.2.6.RELEASE to 5.0.8.RELEASE -* [testing] Bump simple-java-mail from 3.0.1 to 3.1.1 -* [admin] Simpliify .gitignore -* [admin] Remove old netbeans config -* [admin] Switch to trunk based development -* [admin] Stop submitting coverage reports to coveralls -* [admin] Switch to Jenkins for CI/CD - -0.4.0 ------- - -* Upgrade kemitix-parent to 1.1.0 -* (pom) Specify dependency versions in properties -* Upgrade spring-context-support to 4.2.6 (tests) -* Upgrade simple-java-mail to 3.0.1 (tests) - -0.3.2 ------- - -* Upgrade to test with spring-context-support 4.2.5 -* Upgrade to test with simple-java-mail 3.0.0 -* Upgrade kemitix-parent to 0.9.0 - -0.3.1 ------- - -* Add support for Spring Mail's SimpleMailMessage [fixes #6] -* Upgrade kemitix-parent to 0.7.1 - -0.3.0 ------- - -* Add support for nested multi-part emails [jonjo-manywho] [#1] - -0.2.0 ------- - -* 4d01349 Add tests with improved conversion of MIME Multipart messages to string -* d72ca46 Apply Checkstyle formatting (modified sun_checks) rules and add javadoc - -0.1.1 ------ - -* Upgrade javax.mail to 1.4.7 - -0.1.0 ------ - -* Initial release - diff --git a/CHANGELOG.org b/CHANGELOG.org new file mode 100644 index 0000000..e4d332c --- /dev/null +++ b/CHANGELOG.org @@ -0,0 +1,70 @@ +* CHANGELOG + +** next-release + +*** Dependencies + + * Bump mockito-core from 2.21.0 to 2.23.0 + * Bump mon from 0.12.0 to 2.0.0 + * Bump kemitix-parent from 5.1.1 to 5.2.0 + * Bump spring-context-support from 5.0.8 to 5.1.2 + * Bump kemitix-checkstyle-ruleset from 4.1.1 to 5.2.0 + * Bump kemitix-maven-tiles from 0.9.0 to 1.3.1 + +*** Removed + + * Remove travis config + +** 0.5.0 + + * Compatible with Java 10 + * Bump kemitix-parent from 1.1.0 to 5.1.1 + * Use kemitix-checkstyle-ruleset 4.1.1 + * Don't throw generic exceptions + * Add mon 0.12.0 as dependency + * Bump tiles-maven-plugin from 2.11 to 2.12 + * [testing] Use a free port for test mail server + * [testing] Bump mockito-core from 1.10.19 to 2.21.0 + * [testing] Bump spring-context-support from 4.2.6.RELEASE to 5.0.8.RELEASE + * [testing] Bump simple-java-mail from 3.0.1 to 3.1.1 + * [admin] Simpliify .gitignore + * [admin] Remove old netbeans config + * [admin] Switch to trunk based development + * [admin] Stop submitting coverage reports to coveralls + * [admin] Switch to Jenkins for CI/CD + +** 0.4.0 + + * Upgrade kemitix-parent to 1.1.0 + * (pom) Specify dependency versions in properties + * Upgrade spring-context-support to 4.2.6 (tests) + * Upgrade simple-java-mail to 3.0.1 (tests) + +** 0.3.2 + + * Upgrade to test with spring-context-support 4.2.5 + * Upgrade to test with simple-java-mail 3.0.0 + * Upgrade kemitix-parent to 0.9.0 + +** 0.3.1 + + * Add support for Spring Mail's SimpleMailMessage [fixes #6] + * Upgrade kemitix-parent to 0.7.1 + +** 0.3.0 + + * Add support for nested multi-part emails [jonjo-manywho] [#1] + +** 0.2.0 + + * 4d01349 Add tests with improved conversion of MIME Multipart messages to string + * d72ca46 Apply Checkstyle formatting (modified sun_checks) rules and add javadoc + +** 0.1.1 + + * Upgrade javax.mail to 1.4.7 + +** 0.1.0 + + * Initial release + diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index f9bfea5..9832202 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -1,6 +1,5 @@ final String publicRepo = 'https://github.com/kemitix/' final String mvn = "mvn --batch-mode --update-snapshots --errors" -final dependenciesSupportJDK = 10 pipeline { agent any @@ -64,19 +63,17 @@ pipeline { } } } - stage('Build Java 9') { - when { expression { dependenciesSupportJDK >= 9 } } + stage('Build Java 11') { steps { - withMaven(maven: 'maven', jdk: 'JDK 9') { - sh "${mvn} clean verify -Djava.version=9" + withMaven(maven: 'maven', jdk: 'JDK 11') { + sh "${mvn} clean verify -Djava.version=11" } } } - stage('Build Java 10') { - when { expression { dependenciesSupportJDK >= 10 } } + stage('Build Java 12') { steps { - withMaven(maven: 'maven', jdk: 'JDK 10') { - sh "${mvn} clean verify -Djava.version=10" + withMaven(maven: 'maven', jdk: 'JDK 12') { + sh "${mvn} clean verify -Djava.version=12" } } } diff --git a/pom.xml b/pom.xml index 93719f6..2fbac55 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,8 @@ 2.12 - 0.9.0 - 4.1.1 + 1.3.1 + 5.2.0 net.kemitix.wiser.assertions 1.4.7 @@ -103,7 +103,7 @@ true - net.kemitix.tiles:all:${kemitix-tiles.version} + net.kemitix.tiles:all:${kemitix-maven-tiles.version} net.kemitix.checkstyle:tile:${kemitix-checkstyle.version}