@@ -50,29 +50,24 @@ public abstract class GenerateChangelogTask extends JavaExec {
5050
5151 @ Input
5252 @ Optional
53- public abstract Property <String > getUsername ();
54-
55- @ Input
56- @ Optional
57- public abstract Property <String > getPassword ();
53+ public abstract Property <String > getGitHubAccessToken ();
5854
5955 @ OutputFile
6056 public abstract RegularFileProperty getReleaseNotesFile ();
6157
6258 @ Override
6359 public void exec () {
6460 var version = getVersion ().get ();
65- var username = getUsername ().getOrNull ();
66- var password = getPassword ().getOrNull ();
61+ var gitHubAccessToken = getGitHubAccessToken ().getOrNull ();
6762 var outputFile = getReleaseNotesFile ().getAsFile ().get ();
6863 var parent = outputFile .getParentFile ();
6964 if (!parent .exists () && !parent .mkdirs ()) {
7065 throw new IllegalStateException ("Unable to create " + outputFile );
7166 }
7267
7368 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 );
7671 }
7772 args (version , outputFile .toString ());
7873 super .exec ();
@@ -96,17 +91,8 @@ public static void register(Project project) {
9691 // @formatter:on
9792
9893 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 ));
11096 task .getReleaseNotesFile ().set (project .getLayout ().getBuildDirectory ().file (GENERATE_CHANGELOG_PATH ));
11197 });
11298 }
0 commit comments