Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: Remove release mention to stable branch. Fix command line wrong default level value. #1474

Merged
merged 1 commit into from
Jul 18, 2017
Merged

doc: Remove release mention to stable branch. Fix command line wrong default level value. #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions doc/_release/Release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ This article is a short summary of the [official documentation of sonatype](http
1. push the release commit on Github (git push origin master)
- `git push origin master`
- `git push origin spoon-core-X.X.X`
1. update the `stable` branch
- `git checkout stable`
- `git reset --hard <commit-id>` # Where commit-id corresponds to the last commit before those created by maven: we need two commits from previous release to deploy a hotfix.
- `git push origin stable`
1. update the doc, etc., see checklist below

### Checklists
Expand All @@ -38,7 +34,6 @@ This article is a short summary of the [official documentation of sonatype](http
- Update of Spoon's website
- News section in `doc/doc_homepage.md`
- Maven version in `doc/_config.yml`
- Maven snippets in `doc/doc_homepage.md`
- Updates main `README.md`
- Add changelog on release page on GitHub
- Announces release on the mailing list (give credits to the contributors)
Expand Down
3 changes: 1 addition & 2 deletions doc/command_line.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ Options :
Define tabulation size. (default: 4)

[--level <level>]
Level of the ouput messages about what spoon is doing. Default value is
ALL level. (default: OFF)
Level of the ouput messages about what spoon is doing. (default: OFF)

[--with-imports]
Enable imports in generated files.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/spoon/Launcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ protected static JSAP defineArgs() {
// Level logging.
opt2 = new FlaggedOption("level");
opt2.setLongFlag("level");
opt2.setHelp("Level of the ouput messages about what spoon is doing. Default value is ALL level.");
opt2.setHelp("Level of the ouput messages about what spoon is doing.");
opt2.setStringParser(JSAP.STRING_PARSER);
opt2.setDefault(Level.OFF.toString());
jsap.registerParameter(opt2);
Expand Down