Skip to content

Commit

Permalink
chore(release) updating files for release 7.0.1-M1
Browse files Browse the repository at this point in the history
  • Loading branch information
mcjaeger authored and maxhbr committed Jan 30, 2020
1 parent 0594570 commit d6fb37d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ This is the changelog file of the sw360 software. It starts with the first relea

https://github.com/eclipse/sw360

## sw360-7.0.1-M1

After tagging 7.0.0, we found two bugs to be corrected to provide a sound SW360. Therefore, here a new tagged version of sw360. Everyone should use 7.0.1-M1 instead of 7.0.0.

Adding rolling version since last tag will prepare automated tagging with incrementing patch level, retaining manual tagging for major and minor version only.

### Corrections

* `0dcd109` fix(ProjectUI: fixed blank / non-responsive screen on project
* `da677b5` fix(ui): fix issue #762

### Infrastructure

* `a37e24d` chore(readme): adding some more badges
* `f1a7c63`feat(chore): adding rolling versions based on commit count

## sw360-7.0.0-M1

The main reason for release version 7 is to have the license upgrade from EPL-1.0 to EPL-2.0. All contributing parties have submitted their consent by e-mail and on most cases also approved the referring pull request (https://github.com/eclipse/sw360/pull/756).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/eclipse/sw360.svg?branch=master)](https://travis-ci.org/eclipse/sw360)
[![Slack Channel](https://img.shields.io/badge/slack-sw360chat-blue.svg?longCache=true&logo=slack)](https://join.slack.com/t/sw360chat/shared_invite/enQtNzg5NDQxMTQyNjA5LThiMjBlNTRmOWI0ZjJhYjc0OTk3ODM4MjBmOGRhMWRmN2QzOGVmMzQwYzAzN2JkMmVkZTI1ZjRhNmJlNTY4ZGI)
[![Changelog](https://badgen.net/badge/changelog/%E2%98%85/blue)](https://github.com/eclipse/sw360/blob/master/CHANGELOG.md)
[![version](https://img.shields.io/badge/version-7.0.0-blue)](https://github.com/eclipse/sw360/releases/tag/sw360-7.0.0-M1)
[![version](https://img.shields.io/badge/version-7.0.1-blue)](https://github.com/eclipse/sw360/releases/tag/sw360-7.0.1-M1)

### SW360 Portal

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<!-- note that 6.1.0-SNAPSHOT relates to 6.0.${patchlevel} -->
<!-- pls see also the profile cli -->
<revision>7.${patchlevel}</revision>
<patchlevel>1.0-SNAPSHOT</patchlevel>
<patchlevel>0.1</patchlevel>
<java.version>1.8</java.version>
<ektorp.version>1.5.0</ektorp.version>
<thrift.version>0.11.0</thrift.version>
Expand Down

0 comments on commit d6fb37d

Please sign in to comment.