Commit graph

233 commits

Author SHA1 Message Date
54e01e67c8
Merge pull request #29 from kemitix/cleanup
Cleanup ide files and coveralls plugin
2018-08-23 23:06:19 +01:00
9f1519dd34
Merge branch 'master' into cleanup 2018-08-23 23:01:58 +01:00
c6d75de407
Merge pull request #23 from kemitix/dependabot/maven/org.mockito-mockito-core-2.21.0
Bump mockito-core from 1.10.19 to 2.21.0
2018-08-23 23:01:34 +01:00
cb312453b0
Merge branch 'master' into cleanup 2018-08-23 23:00:52 +01:00
dependabot[bot]
3c57633e04
Bump mockito-core from 1.10.19 to 2.21.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 1.10.19 to 2.21.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/commits/v2.21.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-23 21:48:15 +00:00
65b24b7bb3
Merge pull request #25 from kemitix/dependabot/maven/org.springframework-spring-context-support-5.0.8.RELEASE
Bump spring-context-support from 4.2.6.RELEASE to 5.0.8.RELEASE
2018-08-23 22:46:23 +01:00
1dcc74b61d pom: remove coveralls plugin 2018-08-23 22:45:16 +01:00
c61636cfb3 .idea/*.iml: remove intellij project files 2018-08-23 22:44:44 +01:00
455e726130
Merge branch 'master' into dependabot/maven/org.springframework-spring-context-support-5.0.8.RELEASE 2018-08-23 22:42:23 +01:00
7c94087e9e
Merge pull request #24 from kemitix/dependabot/maven/org.eluder.coveralls-coveralls-maven-plugin-4.3.0
Bump coveralls-maven-plugin from 4.2.0 to 4.3.0
2018-08-23 22:41:37 +01:00
462361a3f8
Merge branch 'master' into dependabot/maven/org.eluder.coveralls-coveralls-maven-plugin-4.3.0 2018-08-23 22:33:45 +01:00
b6f87cf6bc
Merge branch 'master' into dependabot/maven/org.springframework-spring-context-support-5.0.8.RELEASE 2018-08-23 22:29:47 +01:00
951e27e672
Merge pull request #27 from kemitix/update-gitignore
Simplify .gitignore and remove ide project files
2018-08-23 22:22:20 +01:00
5cb697e51c
Merge branch 'master' into update-gitignore 2018-08-23 22:18:31 +01:00
125c649d88
Merge pull request #28 from kemitix/jenkins
jenkins: switch to Jenkins and trunk based development
2018-08-23 22:17:32 +01:00
76022b8877 Upgrade kemitix-parent to 5.1.1 to bring Java 9+ compatibility 2018-08-23 22:05:23 +01:00
0f75923d59
Merge branch 'master' into jenkins 2018-08-23 20:34:49 +01:00
88b821c9b7 jenkins: switch to Jenkins and trunk based development 2018-08-23 20:06:10 +01:00
dff5fbb192 Simplify .gitignore and remove ide project files 2018-08-23 19:55:14 +01:00
dependabot[bot]
9f3ccd6abe
Bump spring-context-support from 4.2.6.RELEASE to 5.0.8.RELEASE
Bumps [spring-context-support](https://github.com/spring-projects/spring-framework) from 4.2.6.RELEASE to 5.0.8.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v4.2.6.RELEASE...v5.0.8.RELEASE)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-23 14:09:43 +00:00
dependabot[bot]
65df6850bb
Bump coveralls-maven-plugin from 4.2.0 to 4.3.0
Bumps [coveralls-maven-plugin](https://github.com/trautonen/coveralls-maven-plugin) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/trautonen/coveralls-maven-plugin/releases)
- [Changelog](https://github.com/trautonen/coveralls-maven-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trautonen/coveralls-maven-plugin/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-23 14:09:38 +00:00
d6ce70399d Merge pull request #22 from kemitix/update-gitignore
Update .gitignore
2016-06-10 11:17:15 +01:00
3984f80146 Add files not longer ignored 2016-06-10 10:36:59 +01:00
8e950db6f4 Update .gitignore to use template 2016-06-10 10:36:43 +01:00
afefc3bd33 Merge pull request #21 from kemitix/travis-coverage-correct-command
Use correct coverage test command
2016-06-02 23:07:53 +01:00
03063ef9b7 Use correct coverage test command
Cut-and-pasted the wrong example command for travis-CI.
2016-06-02 23:03:24 +01:00
dadcb1fa4c Merge pull request #20 from kemitix/add-status-badges
Add Build and Coverage Status badges to README.md
2016-06-02 22:55:50 +01:00
67fb0d0901 Add Build and Coverage Status badges to README.md 2016-06-02 21:43:41 +01:00
37e8b6fbf1 Merge pull request #19 from kemitix/report-coverage-results-to-coveralls
Report coverage reports to coveralls
2016-06-02 21:40:46 +01:00
8b7c49bc31 Merge branch 'develop' into report-coverage-results-to-coveralls 2016-06-02 21:36:23 +01:00
01a370b8b6 Merge pull request #18 from kemitix/update-simple-java-mail-to-3.1.1
Update simple-java-mail to 3.1.1
2016-06-02 21:36:15 +01:00
52d4ede96d Merge branch 'develop' into report-coverage-results-to-coveralls 2016-06-02 21:33:23 +01:00
80fbbb1c60 Report coverage reports to coveralls 2016-06-02 21:32:45 +01:00
dbba991d20 Merge branch 'develop' into update-simple-java-mail-to-3.1.1 2016-06-02 21:31:07 +01:00
c44f0b03b5 Merge pull request #17 from kemitix/upgrade-kemitix-parent-to-1.2.0
Upgrade kemitix-parent to 1.2.0
2016-06-02 21:25:43 +01:00
2543593f21 Upgrade simple-java-mail to 3.1.1 2016-06-02 21:22:31 +01:00
235ea47957 Update code style and reorganise methods 2016-06-02 21:13:39 +01:00
d20322cc65 WiserAssertions: suppress checkstyle rule IllegalThrows 2016-06-02 20:56:22 +01:00
af4b48e212 WiserAssertions: suppress checkstyle rule IllegalCatch 2016-06-02 20:55:35 +01:00
cef89074ef WiserAssertions: apply rule ReturnCount 2016-06-02 20:53:47 +01:00
97d67cb557 WiserAssertions: apply checkstyle rule MultipleStringLiterals 2016-06-02 20:53:47 +01:00
79032c0dd8 WiserAssertions: apply checkstyle rule DeclarationOrder 2016-06-02 20:46:39 +01:00
1bc8bac229 Update checkstyle ruleset from kemitix-parent-1.2.0 template 2016-06-02 20:44:51 +01:00
89f0f87203 Upgrade kemitix-parent to 1.2.0 2016-06-02 20:43:07 +01:00
e6a7179b52 Merge branch 'release/0.4.0' into develop
* release/0.4.0:
  CHANGELOG
  pom.xml: version set to 0.4.0
  pom.xml: Upgrade kemitix-parent to 0.9.0
2016-05-09 11:45:56 +01:00
14c4e6c536 Merge branch 'release/0.4.0'
* release/0.4.0:
  CHANGELOG
  pom.xml: version set to 0.4.0
  Upgrade kemitix-parent to 1.1.0
  Specify dependency versions in properties
  Upgrade kemitix-parent to 1.0.0
  Upgrade spring-context-support to 4.2.6
  Upgrade to test against simple-java-mail 3.0.1
  pom.xml: version set to 0.4.0-SNAPSHOT
2016-05-09 11:45:30 +01:00
d9c71f9756 Fix merge conflict with master branch
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-09 11:45:10 +01:00
813db80045 CHANGELOG 2016-05-09 11:41:22 +01:00
492cf8c6e3 pom.xml: version set to 0.4.0 2016-05-09 11:41:22 +01:00
b66a6996b9 Merge pull request #16 from kemitix/upgrade-kemitix-parent-to-1.1.0
Upgrade kemitix-parent to 1.1.0
2016-05-09 11:36:28 +01:00