@@ -50,29 +50,24 @@ public abstract class GenerateChangelogTask extends JavaExec {
50
50
51
51
@ Input
52
52
@ Optional
53
- public abstract Property <String > getUsername ();
54
-
55
- @ Input
56
- @ Optional
57
- public abstract Property <String > getPassword ();
53
+ public abstract Property <String > getGitHubAccessToken ();
58
54
59
55
@ OutputFile
60
56
public abstract RegularFileProperty getReleaseNotesFile ();
61
57
62
58
@ Override
63
59
public void exec () {
64
60
var version = getVersion ().get ();
65
- var username = getUsername ().getOrNull ();
66
- var password = getPassword ().getOrNull ();
61
+ var gitHubAccessToken = getGitHubAccessToken ().getOrNull ();
67
62
var outputFile = getReleaseNotesFile ().getAsFile ().get ();
68
63
var parent = outputFile .getParentFile ();
69
64
if (!parent .exists () && !parent .mkdirs ()) {
70
65
throw new IllegalStateException ("Unable to create " + outputFile );
71
66
}
72
67
73
68
args ("--spring.config.location=scripts/release/release-notes-sections.yml" );
74
- if (username != null && password != null ) {
75
- args ("--github.username =" + username , "--github.password=" + password );
69
+ if (gitHubAccessToken != null ) {
70
+ args ("--github.token =" + gitHubAccessToken );
76
71
}
77
72
args (version , outputFile .toString ());
78
73
super .exec ();
@@ -96,17 +91,8 @@ public static void register(Project project) {
96
91
// @formatter:on
97
92
98
93
task .getVersion ().set (versionProvider );
99
- if (project .hasProperty (SpringReleasePlugin .GITHUB_ACCESS_TOKEN_PROPERTY )) {
100
- // @formatter:off
101
- var usernameProvider = ProjectUtils .getProperty (project , SpringReleasePlugin .GITHUB_USER_NAME_PROPERTY )
102
- .orElse (ProjectUtils .findTaskByType (project , GetGitHubUserNameTask .class )
103
- .getUsernameFile ()
104
- .map (RegularFileUtils ::readString ));
105
- // @formatter:on
106
- task .getUsername ().set (usernameProvider );
107
- task .getPassword ()
108
- .set (ProjectUtils .getProperty (project , SpringReleasePlugin .GITHUB_ACCESS_TOKEN_PROPERTY ));
109
- }
94
+ task .getGitHubAccessToken ()
95
+ .set (ProjectUtils .getProperty (project , SpringReleasePlugin .GITHUB_ACCESS_TOKEN_PROPERTY ));
110
96
task .getReleaseNotesFile ().set (project .getLayout ().getBuildDirectory ().file (GENERATE_CHANGELOG_PATH ));
111
97
});
112
98
}
0 commit comments