diff --git a/pom.xml b/pom.xml index 19d15d77..1d4464d4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-build - 4.0.6 + 4.0.3 @@ -47,8 +47,6 @@ 1.1.0 1.12 4.11.0 - 2.17.0 - 4.0.6 @@ -147,16 +145,6 @@ awaitility ${awaitility.version} - - org.jfrog.artifactory.client - artifactory-java-client-services - ${artifactory-client.version} - - - org.apache.groovy - groovy - ${groovy.version} - diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 320d1de6..c840cfdd 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -113,58 +113,3 @@ releaser: projects-to-skip: - spring-boot - spring-cloud-stream - bundles: - repos: - spring-cloud-build: - - "org/springframework/cloud/spring-cloud-build*" - - "org/springframework/cloud/spring-cloud-starter-build*" - - "org/springframework/cloud/spring-cloud-dependencies-parent*" - spring-cloud-config: - - "org/springframework/cloud/spring-cloud-config*" - - "org/springframework/cloud/spring-cloud-starter-config*" - spring-cloud-function: - - "org/springframework/cloud/spring-cloud-function*" - - "org/springframework/cloud/spring-cloud-starter-function*" - spring-cloud-stream: - - "org/springframework/cloud/spring-cloud-stream*" - - "org/springframework/cloud/spring-cloud-starter-stream*" - spring-cloud-task: - - "org/springframework/cloud/spring-cloud-task*" - - "org/springframework/cloud/spring-cloud-starter-task*" - spring-cloud-bus: - - "org/springframework/cloud/spring-cloud-bus*" - - "org/springframework/cloud/spring-cloud-starter-bus*" - spring-cloud-commons: - - "org/springframework/cloud/spring-cloud-commons*" - - "org/springframework/cloud/spring-cloud-starter-commons*" - spring-cloud-netflix: - - "org/springframework/cloud/spring-cloud-netflix*" - - "org/springframework/cloud/spring-cloud-starter-netflix*" - spring-cloud-openfeign: - - "org/springframework/cloud/spring-cloud-openfeign*" - - "org/springframework/cloud/spring-cloud-starter-openfeign*" - spring-cloud-consul: - - "org/springframework/cloud/spring-cloud-consul*" - - "org/springframework/cloud/spring-cloud-starter-consul*" - spring-cloud-circuitbreaker: - - "org/springframework/cloud/spring-cloud-circuitbreaker*" - - "org/springframework/cloud/spring-cloud-starter-circuitbreaker*" - spring-cloud-gateway: - - "org/springframework/cloud/spring-cloud-gateway*" - - "org/springframework/cloud/spring-cloud-starter-gateway*" - spring-cloud-zookeeper: - - "org/springframework/cloud/spring-cloud-zookeeper*" - - "org/springframework/cloud/spring-cloud-starter-zookeeper*" - spring-cloud-contract: - - "org/springframework/cloud/spring-cloud-contract*" - - "org/springframework/cloud/spring-cloud-starter-contract*" - spring-cloud-kubernetes: - - "org/springframework/cloud/spring-cloud-kubernetes*" - - "org/springframework/cloud/spring-cloud-starter-kubernetes*" - spring-cloud-vault: - - "org/springframework/cloud/spring-cloud-vault*" - - "org/springframework/cloud/spring-cloud-starter-vault*" - # This is Spring Cloud Release, the POM id is spring-cloud-starter-build - spring-cloud-starter-build: - - "org/springframework/cloud/spring-cloud-starter*" - - "org/springframework/cloud/spring-cloud-dependencies*" diff --git a/releaser-core/pom.xml b/releaser-core/pom.xml index b0ee9beb..968d34e6 100644 --- a/releaser-core/pom.xml +++ b/releaser-core/pom.xml @@ -91,14 +91,6 @@ io.spring.initializr initializr-metadata - - org.jfrog.artifactory.client - artifactory-java-client-services - - - org.apache.groovy - groovy - org.springframework.boot spring-boot-starter-test diff --git a/releaser-core/src/main/java/releaser/internal/Releaser.java b/releaser-core/src/main/java/releaser/internal/Releaser.java index 4c1dae2c..fe8ba8a7 100644 --- a/releaser-core/src/main/java/releaser/internal/Releaser.java +++ b/releaser-core/src/main/java/releaser/internal/Releaser.java @@ -18,13 +18,11 @@ package releaser.internal; import java.io.File; import java.util.List; -import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import releaser.internal.buildsystem.GradleUpdater; import releaser.internal.buildsystem.ProjectPomUpdater; -import releaser.internal.commercial.ReleaseBundleCreator; import releaser.internal.docs.DocumentationUpdater; import releaser.internal.git.ProjectGitHandler; import releaser.internal.github.ProjectGitHubHandler; @@ -71,13 +69,11 @@ public class Releaser { private ReleaserProperties releaserProperties; - private ReleaseBundleCreator releaseBundleCreator; - public Releaser(ReleaserProperties releaserProperties, ProjectPomUpdater projectPomUpdater, ProjectCommandExecutor projectCommandExecutor, ProjectGitHandler projectGitHandler, ProjectGitHubHandler projectGitHubHandler, TemplateGenerator templateGenerator, GradleUpdater gradleUpdater, - SaganUpdater saganUpdater, DocumentationUpdater documentationUpdater, PostReleaseActions postReleaseActions, - ReleaseBundleCreator releaseBundleCreator) { + SaganUpdater saganUpdater, DocumentationUpdater documentationUpdater, + PostReleaseActions postReleaseActions) { this.releaserProperties = releaserProperties; this.projectPomUpdater = projectPomUpdater; this.projectCommandExecutor = projectCommandExecutor; @@ -88,7 +84,6 @@ public class Releaser { this.saganUpdater = saganUpdater; this.documentationUpdater = documentationUpdater; this.postReleaseActions = postReleaseActions; - this.releaseBundleCreator = releaseBundleCreator; } public File clonedProjectFromOrg(String projectName) { @@ -382,41 +377,4 @@ public class Releaser { return ExecutionResult.skipped(); } - public ExecutionResult createReleaseBundle(boolean commercial, ProjectVersion versionFromBom, Boolean dryRun, - Map> commercialRepos, String projectName) { - if (dryRun) { - log.info("\nWon't create a release bundle for a dry run"); - return ExecutionResult.skipped(); - } - if (versionFromBom.isSnapshot()) { - log.info("\nWon't create a release bundle for a SNAPSHOT version"); - return ExecutionResult.skipped(); - } - if (!commercial) { - log.info("\nWon't create a release bundle for a non commercial project"); - return ExecutionResult.skipped(); - } - log.info("\nCreating a release bundle"); - if (!commercialRepos.containsKey(projectName)) { - log.warn("No commercial repos configured for project [{}], double check releaser.bundles.repos", - projectName); - } - List repos = commercialRepos.get(projectName); - log.info("Creating release bundles for project [{}] in repos [{}]", projectName, repos); - try { - boolean result = this.releaseBundleCreator.createReleaseBundle(repos, versionFromBom.version, - "TNZ-" + projectName + "-commercial"); - if (!result) { - log.warn("Failed to create release bundle"); - return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release bundle")); - } - log.info("\nSuccessfully created a release bundle"); - return ExecutionResult.success(); - } - catch (Exception ex) { - log.error("Failed to create a release bundle", ex); - return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release bundle", ex)); - } - } - } diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index d6484235..5176229f 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -80,8 +80,6 @@ public class ReleaserProperties implements Serializable { private boolean commercial = false; - private Bundles bundles = new Bundles(); - /** * Project name to its version - overrides all versions retrieved from a release train * repository like Spring Cloud Release. @@ -210,14 +208,6 @@ public class ReleaserProperties implements Serializable { this.commercial = commercial; } - public Bundles getBundles() { - return bundles; - } - - public void setBundles(Bundles bundles) { - this.bundles = bundles; - } - @Override public String toString() { return "ReleaserProperties{" + "workingDir='" + this.workingDir + '\'' + ", git=" + this.git + ", pom=" @@ -1573,68 +1563,4 @@ public class ReleaserProperties implements Serializable { } - public static class Bundles implements Serializable { - - private boolean createProjectReleaseBundle = false; - - private boolean createReleaseTrainReleaseBundle = false; - - private String repoUrl = "https://usw1.packages.broadcom.com"; - - private String repoUsername; - - private String repoAccessToken; - - private Map> repos; - - public boolean isCreateProjectReleaseBundle() { - return createProjectReleaseBundle; - } - - public void setCreateProjectReleaseBundle(boolean createProjectReleaseBundle) { - this.createProjectReleaseBundle = createProjectReleaseBundle; - } - - public boolean isCreateReleaseTrainReleaseBundle() { - return createReleaseTrainReleaseBundle; - } - - public void setCreateReleaseTrainReleaseBundle(boolean createReleaseTrainReleaseBundle) { - this.createReleaseTrainReleaseBundle = createReleaseTrainReleaseBundle; - } - - public Map> getRepos() { - return repos; - } - - public void setRepos(Map> repos) { - this.repos = repos; - } - - public String getRepoUrl() { - return repoUrl; - } - - public void setRepoUrl(String repoUrl) { - this.repoUrl = repoUrl; - } - - public String getRepoUsername() { - return repoUsername; - } - - public void setRepoUsername(String repoUsername) { - this.repoUsername = repoUsername; - } - - public String getRepoAccessToken() { - return repoAccessToken; - } - - public void setRepoAccessToken(String repoAccessToken) { - this.repoAccessToken = repoAccessToken; - } - - } - } diff --git a/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java b/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java deleted file mode 100644 index 66bc96d6..00000000 --- a/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2013-2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package releaser.internal.commercial; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.jfrog.artifactory.client.Artifactory; -import org.jfrog.artifactory.client.ArtifactoryClientBuilder; -import org.jfrog.artifactory.client.ArtifactoryRequest; -import org.jfrog.artifactory.client.ArtifactoryResponse; -import org.jfrog.artifactory.client.aql.AqlItem; -import org.jfrog.artifactory.client.aql.AqlQueryBuilder; -import org.jfrog.artifactory.client.impl.ArtifactoryRequestImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import releaser.internal.ReleaserProperties; - -/** - * @author Ryan Baxter - */ -public class ReleaseBundleCreator { - - private static final Logger log = LoggerFactory.getLogger(ReleaseBundleCreator.class); - - private Artifactory artifactory; - - private ObjectMapper objectMapper; - - public ReleaseBundleCreator(ReleaserProperties properties) { - log.info("Creating Artifactory client with URL [{}]", properties.getBundles().getRepoUrl()); - log.info("Creating Artifactory client with username [{}]", properties.getBundles().getRepoUsername()); - log.info("Creating Artifactory client with access token [{}]", properties.getBundles().getRepoAccessToken()); - this.artifactory = ArtifactoryClientBuilder.create().setUrl(properties.getBundles().getRepoUrl()) - .setUsername(properties.getBundles().getRepoUsername()) - .setAccessToken(properties.getBundles().getRepoAccessToken()).build(); - this.objectMapper = new ObjectMapper(); - } - - public boolean createReleaseBundle(List repos, String version, String releaseBundleName) throws IOException { - Map json = new HashMap<>(); - json.put("release_bundle_name", releaseBundleName); - json.put("release_bundle_version", version); - json.put( "source_type", "aql"); - json.put("source", createAqlMap(repos, version)); - return createReleaseBundle(objectMapper.writeValueAsString(json)); - } - - private Map createAqlMap(List repos, String version) { - String aql = createAql(repos, version); - Map aqlObject = new HashMap<>(); - aqlObject.put("aql", aql); - return aqlObject; - } - - private String createAql(List repos, String version) { - AqlQueryBuilder builder = new AqlQueryBuilder() - .item(AqlItem.aqlItem("repo", AqlItem.aqlItem("$eq", "spring-enterprise-maven-prod-local"))); - - AqlItem[] items = new AqlItem[repos.size()]; - for (String repo : repos) { - items[repos.indexOf(repo)] = AqlItem.match("path", repo + "/" + version); - } - return builder.or(items).asc("path", "name").build(); - } - - public boolean createReleaseBundle(String json) throws IOException { - log.info("Creating release bundle with JSON [{}]", json); - - ArtifactoryRequest aqlRequest = new ArtifactoryRequestImpl().method(ArtifactoryRequest.Method.POST) - .apiUrl("lifecycle/api/v2/release_bundle").addQueryParam("project", "spring") - .addHeader("X-JFrog-Signing-Key-Name", "packagesKey").requestType(ArtifactoryRequest.ContentType.JSON) - .responseType(ArtifactoryRequest.ContentType.JSON).requestBody(json); - ArtifactoryResponse response = artifactory.restCall(aqlRequest); - if (!response.isSuccessResponse()) { - log.warn("Failed to create release bundle {}", response.getRawBody()); - return false; - } - log.info("Created release bundle {}", response.getRawBody()); - return true; - - } - -} diff --git a/releaser-core/src/main/java/releaser/internal/postrelease/PostReleaseActions.java b/releaser-core/src/main/java/releaser/internal/postrelease/PostReleaseActions.java index ef3ae466..8b56bce2 100644 --- a/releaser-core/src/main/java/releaser/internal/postrelease/PostReleaseActions.java +++ b/releaser-core/src/main/java/releaser/internal/postrelease/PostReleaseActions.java @@ -281,12 +281,8 @@ public class PostReleaseActions implements Closeable { return ExecutionResult.skipped(); } ProjectVersion releaseTrain = projects.releaseTrain(this.properties); - log.debug("generating release train documentation for release train {}", releaseTrain); - log.debug("\t\t releaseTrainDocsUrl {}", this.properties.getGit().getReleaseTrainDocsUrl()); - log.debug("\t\t properties {}", this.properties); File file; String branch = releaseTrain.releaseTagName(); - log.debug("\t\t branch {}", branch); if (StringUtils.hasText(branch)) { file = this.projectGitHandler.cloneReleaseTrainDocumentationProject(branch); } @@ -295,7 +291,6 @@ public class PostReleaseActions implements Closeable { file = this.projectGitHandler.cloneReleaseTrainDocumentationProject(); } ReleaserProperties projectProps = projectProps(file); - log.debug("\t\t projectProps {}", projectProps); String releaseTrainVersion = releaseTrain.version; this.projectCommandExecutor.generateReleaseTrainDocs(projectProps, releaseTrainVersion, file.getAbsolutePath()); return ExecutionResult.success(); diff --git a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java index 432e22db..513bc71b 100644 --- a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java +++ b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java @@ -17,7 +17,6 @@ package releaser.internal; import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.function.Supplier; @@ -32,7 +31,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import releaser.SpringCloudReleaserProperties; import releaser.internal.buildsystem.GradleUpdater; import releaser.internal.buildsystem.ProjectPomUpdater; -import releaser.internal.commercial.ReleaseBundleCreator; import releaser.internal.docs.DocumentationUpdater; import releaser.internal.git.ProjectGitHandler; import releaser.internal.github.ProjectGitHubHandler; @@ -94,13 +92,7 @@ public class ReleaserTests { Releaser releaser(Supplier originalVersionSupplier) { return new Releaser(SpringCloudReleaserProperties.get(), this.projectPomUpdater, this.projectCommandExecutor, this.projectGitHandler, this.projectGitHubHandler, this.templateGenerator, this.gradleUpdater, - this.saganUpdater, this.documentationUpdater, this.postReleaseActions, - new ReleaseBundleCreator(SpringCloudReleaserProperties.get()) { - @Override - public boolean createReleaseBundle(String json) throws IOException { - return true; - } - }) { + this.saganUpdater, this.documentationUpdater, this.postReleaseActions) { @Override ProjectVersion originalVersion(File project) { return originalVersionSupplier.get(); @@ -111,13 +103,7 @@ public class ReleaserTests { Releaser releaser() { return new Releaser(new ReleaserProperties(), this.projectPomUpdater, this.projectCommandExecutor, this.projectGitHandler, this.projectGitHubHandler, this.templateGenerator, this.gradleUpdater, - this.saganUpdater, this.documentationUpdater, this.postReleaseActions, - new ReleaseBundleCreator(SpringCloudReleaserProperties.get()) { - @Override - public boolean createReleaseBundle(String json) throws IOException { - return true; - } - }); + this.saganUpdater, this.documentationUpdater, this.postReleaseActions); } @Test diff --git a/releaser-spring/src/main/java/releaser/internal/spring/ReleaserConfiguration.java b/releaser-spring/src/main/java/releaser/internal/spring/ReleaserConfiguration.java index 9768a34b..dd1b20a9 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/ReleaserConfiguration.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/ReleaserConfiguration.java @@ -24,7 +24,6 @@ import releaser.internal.ReleaserProperties; import releaser.internal.ReleaserPropertiesUpdater; import releaser.internal.buildsystem.GradleUpdater; import releaser.internal.buildsystem.ProjectPomUpdater; -import releaser.internal.commercial.ReleaseBundleCreator; import releaser.internal.docs.CustomProjectDocumentationUpdater; import releaser.internal.docs.DocumentationUpdater; import releaser.internal.git.ProjectGitHandler; @@ -155,10 +154,10 @@ class ReleaserConfiguration { ProjectGitHandler projectGitHandler, ProjectGitHubHandler projectGitHubHandler, TemplateGenerator templateGenerator, GradleUpdater gradleUpdater, SaganUpdater saganUpdater, DocumentationUpdater documentationUpdater, PostReleaseActions postReleaseActions, - ReleaserProperties releaserProperties, ReleaseBundleCreator releaseBundleCreator) { + ReleaserProperties releaserProperties) { return new Releaser(releaserProperties, projectPomUpdater, projectCommandExecutor, projectGitHandler, projectGitHubHandler, templateGenerator, gradleUpdater, saganUpdater, documentationUpdater, - postReleaseActions, releaseBundleCreator); + postReleaseActions); } @Bean @@ -174,10 +173,4 @@ class ReleaserConfiguration { return new OptionsParser(allTasks, singleProjectReleaserTasks, context); } - @Bean - @ConditionalOnMissingBean - ReleaseBundleCreator releaseBundleCreator(ReleaserProperties properties) { - return new ReleaseBundleCreator(properties); - } - } diff --git a/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java b/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java index f4a92835..1341beff 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java @@ -211,9 +211,7 @@ class SpringBatchFlowRunner implements FlowRunner, Closeable { @Override public ExecutionResult runReleaseTasks(Options options, ReleaserProperties properties, ProjectsToRun projectsToRun, TasksToRun tasksToRun) { - // TODO this seems to not be exclusive to meta releases - if (properties.isPostReleaseTasksOnly()/** && options.metaRelease */ - ) { + if (properties.isPostReleaseTasksOnly() && options.metaRelease) { log.info("Only post release tasks will be executed for the meta release"); return ExecutionResult.skipped(); } diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateProjectReleaseBundlePostReleaseTask.java b/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateProjectReleaseBundlePostReleaseTask.java deleted file mode 100644 index 53a7ccfc..00000000 --- a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateProjectReleaseBundlePostReleaseTask.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2013-2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package releaser.internal.tasks.postrelease; - -import releaser.internal.Releaser; -import releaser.internal.project.ProjectVersion; -import releaser.internal.spring.Arguments; -import releaser.internal.tasks.ProjectPostReleaseReleaserTask; -import releaser.internal.tech.BuildUnstableException; -import releaser.internal.tech.ExecutionResult; - -/** - * @author Ryan Baxter - */ -public class CreateProjectReleaseBundlePostReleaseTask implements ProjectPostReleaseReleaserTask { - - /** - * Order of this task. The higher value, the lower order. - */ - public static final int ORDER = 60; - - private final Releaser releaser; - - public CreateProjectReleaseBundlePostReleaseTask(Releaser releaser) { - this.releaser = releaser; - } - - @Override - public String name() { - return "createReleaseBundle"; - } - - @Override - public String shortName() { - return "b"; - } - - @Override - public String header() { - return "CREATING RELEASE BUNDLE"; - } - - @Override - public String description() { - return "Creates a release bundle for the project"; - } - - @Override - public ExecutionResult runTask(Arguments args) throws BuildUnstableException, RuntimeException { - return this.releaser.createReleaseBundle(args.properties.isCommercial(), args.versionFromBom, - args.options.dryRun, args.properties.getBundles().getRepos(), - new ProjectVersion(args.project).projectName); - } - - @Override - public int getOrder() { - return ORDER; - } - -} diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateReleaseTrainReleaseBundlePostReleaseTask.java b/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateReleaseTrainReleaseBundlePostReleaseTask.java deleted file mode 100644 index 779c9c49..00000000 --- a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateReleaseTrainReleaseBundlePostReleaseTask.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2013-2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package releaser.internal.tasks.postrelease; - -import releaser.internal.Releaser; -import releaser.internal.project.ProjectVersion; -import releaser.internal.spring.Arguments; -import releaser.internal.tasks.TrainPostReleaseReleaserTask; -import releaser.internal.tech.BuildUnstableException; -import releaser.internal.tech.ExecutionResult; - -/** - * @author Ryan Baxter - */ -public class CreateReleaseTrainReleaseBundlePostReleaseTask implements TrainPostReleaseReleaserTask { - - /** - * Order of this task. The higher value, the lower order. - */ - public static final int ORDER = 160; - - private final Releaser releaser; - - public CreateReleaseTrainReleaseBundlePostReleaseTask(Releaser releaser) { - this.releaser = releaser; - } - - @Override - public String name() { - return "createReleaseTrainReleaseBundlePostReleaseTask"; - } - - @Override - public String shortName() { - return "rtb"; - } - - @Override - public String header() { - return "CREATE RELEASE TRAIN RELEASE BUNDLE"; - } - - @Override - public String description() { - return "Creates a release train release bundle"; - } - - @Override - public ExecutionResult runTask(Arguments args) throws BuildUnstableException, RuntimeException { - return releaser.createReleaseBundle(args.properties.isCommercial(), args.versionFromBom, args.options.dryRun, - args.properties.getBundles().getRepos(), new ProjectVersion(args.project).projectName); - } - - @Override - public int getOrder() { - return ORDER; - } - -} diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/PostReleaseTasksConfiguration.java b/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/PostReleaseTasksConfiguration.java index f7acf615..ce824c13 100644 --- a/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/PostReleaseTasksConfiguration.java +++ b/releaser-spring/src/main/java/releaser/internal/tasks/postrelease/PostReleaseTasksConfiguration.java @@ -92,18 +92,4 @@ class PostReleaseTasksConfiguration { return new UpdateStartSpringIoTrainPostReleaseTask(releaser); } - @Bean - @ConditionalOnMissingBean - @ConditionalOnProperty("releaser.bundles.create-release-train-release-bundle") - CreateReleaseTrainReleaseBundlePostReleaseTask createReleaseTrainReleaseBundlePostReleaseTask(Releaser releaser) { - return new CreateReleaseTrainReleaseBundlePostReleaseTask(releaser); - } - - @Bean - @ConditionalOnMissingBean - @ConditionalOnProperty("releaser.bundles.create-project-release-bundle") - CreateProjectReleaseBundlePostReleaseTask createProjectReleaseBundlePostReleaseTask(Releaser releaser) { - return new CreateProjectReleaseBundlePostReleaseTask(releaser); - } - }