Skip to content

Commit 8fb4efb

Browse files
stariy95stariy95
committed
- cleanup
1 parent 1ae79b4 commit 8fb4efb

20 files changed

Lines changed: 3 additions & 687 deletions

File tree

‎src/main/assets/js/baseController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const baseMethods = {
4444
} else {
4545
this.sortDir = "DESC";
4646
}
47-
uri += "sort=" + sort + "&dir=" + this.sortDir;
47+
uri += "sort=" + sort + "&direction=" + this.sortDir;
4848
this.isASC = !this.isASC;
4949
}
5050
if (filter !== null) {

‎src/main/assets/js/main.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,23 @@ import '@fortawesome/fontawesome-free/js/all';
66
// export everything used directly from HTML in the global scope
77
import { initMilestoneView } from "./view/milestoneView";
88
import { initBranchView } from "./view/branchView";
9-
import { initValidationView } from "./view/validationView";
109
import { initReleaseNotesView } from "./view/releaseNotesView";
1110
import { initIssueVue } from "./view/issueVue";
1211
import { initRepoVue } from "./view/repoVue";
1312
import { initPrVue } from "./view/prVue";
14-
import { initExtraRollback } from "./view/extraRollback";
1513
import { initMavenVue } from "./view/mavenVue";
1614
import { initRelease } from "./view/release";
1715
import { initReleaseProcess } from "./releaseProcess";
1816

1917
window.initRepoVue = initRepoVue;
2018
window.initIssueVue = initIssueVue;
2119
window.initBranchView = initBranchView;
22-
window.initExtraRollback = initExtraRollback;
2320
window.initMavenVue = initMavenVue;
2421
window.initMilestoneView = initMilestoneView;
2522
window.initPrVue = initPrVue;
2623
window.initReleaseNotesView = initReleaseNotesView;
27-
window.initValidationView = initValidationView;
2824
window.initRelease = initRelease;
2925
window.initReleaseProcess = initReleaseProcess;
30-
//window.initReleaseTableHead = initReleaseTableHead
3126

3227
$(document).ready(() => init());
3328

‎src/main/assets/js/view/extraRollback.js‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/main/assets/js/view/issueVue.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Vue from 'vue/dist/vue'
2-
import axios from 'axios/dist/axios'
32

43
import { baseMethods } from "../baseController";
54

‎src/main/assets/js/view/prVue.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Vue from 'vue/dist/vue'
2-
import axios from 'axios/dist/axios'
32

43
import { baseMethods } from "../baseController";
54

‎src/main/assets/js/view/repoVue.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Vue from 'vue/dist/vue'
2-
import axios from 'axios/dist/axios'
32

43
import { baseMethods } from "../baseController";
54

‎src/main/assets/js/view/validationView.js‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/main/java/io/bootique/tools/release/Application.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import io.bootique.tools.release.job.MavenProjectsImport;
2323
import io.bootique.tools.release.model.release.ReleaseStage;
2424
import io.bootique.tools.release.model.release.RollbackStage;
25-
import io.bootique.tools.release.service.central.DefaultMvnCentralService;
26-
import io.bootique.tools.release.service.central.MvnCentralService;
2725
import io.bootique.tools.release.service.desktop.DesktopService;
2826
import io.bootique.tools.release.service.desktop.GenericDesktopService;
2927
import io.bootique.tools.release.service.desktop.LinuxDesktopService;
@@ -67,10 +65,10 @@
6765
import io.bootique.tools.release.service.release.stage.updater.StageListener;
6866
import io.bootique.tools.release.service.release.stage.updater.StageUpdaterImpService;
6967
import io.bootique.tools.release.service.release.stage.updater.StageUpdaterService;
68+
import io.bootique.tools.release.service.tasks.ReleaseCentralPublishTask;
7069
import io.bootique.tools.release.service.tasks.ReleasePerformTask;
7170
import io.bootique.tools.release.service.tasks.ReleasePrepareTask;
7271
import io.bootique.tools.release.service.tasks.ReleasePullTask;
73-
import io.bootique.tools.release.service.tasks.ReleaseSonatypeSyncTask;
7472
import io.bootique.tools.release.service.tasks.ReleaseTask;
7573
import io.bootique.tools.release.service.tasks.ReleaseValidationTask;
7674
import io.bootique.tools.release.service.tasks.RollbackMvnGitTask;
@@ -100,7 +98,6 @@ public void configure(Binder binder) {
10098
binder.bind(MavenService.class).to(DefaultMavenService.class).inSingletonScope();
10199
binder.bind(BatchJobService.class).to(DefaultBatchJobService.class).inSingletonScope();
102100
binder.bind(LoggerService.class).to(DefaultLoggerService.class).inSingletonScope();
103-
binder.bind(MvnCentralService.class).to(DefaultMvnCentralService.class).inSingletonScope();
104101
binder.bind(ReleaseNotesService.class).to(DefaultReleaseNotesService.class).inSingletonScope();
105102
binder.bind(ValidatePomService.class).to(DefaultValidatePomService.class).inSingletonScope();
106103

@@ -137,7 +134,7 @@ public void configure(Binder binder) {
137134
.put(ReleaseStage.RELEASE_VALIDATION, ReleaseValidationTask.class)
138135
.put(ReleaseStage.RELEASE_PREPARE, ReleasePrepareTask.class)
139136
.put(ReleaseStage.RELEASE_PERFORM, ReleasePerformTask.class)
140-
.put(ReleaseStage.RELEASE_SYNC, ReleaseSonatypeSyncTask.class);
137+
.put(ReleaseStage.RELEASE_SYNC, ReleaseCentralPublishTask.class);
141138

142139

143140
binder.bindMap(RollbackStage.class, ReleaseTask.class)

‎src/main/java/io/bootique/tools/release/controller/ExtraRollbackController.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/main/java/io/bootique/tools/release/controller/ValidationController.java‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,23 @@
11
package io.bootique.tools.release.controller;
22

3-
import io.bootique.tools.release.model.maven.persistent.Project;
43
import io.bootique.tools.release.model.persistent.Repository;
5-
import io.bootique.tools.release.service.desktop.DesktopException;
6-
import io.bootique.tools.release.service.desktop.DesktopService;
7-
import io.bootique.tools.release.service.git.GitService;
8-
import io.bootique.tools.release.service.job.JobException;
94
import io.bootique.tools.release.service.validation.ValidatePomService;
10-
import io.bootique.tools.release.view.ValidationView;
115
import jakarta.inject.Inject;
126
import jakarta.ws.rs.GET;
137
import jakarta.ws.rs.Path;
14-
import jakarta.ws.rs.QueryParam;
158
import org.apache.cayenne.ObjectContext;
169
import org.apache.cayenne.query.ObjectSelect;
1710

18-
import java.io.IOException;
1911
import java.util.LinkedHashMap;
2012
import java.util.List;
2113
import java.util.Map;
22-
import java.util.function.Function;
2314

2415
@Path("/validation")
2516
public class ValidationController extends BaseJobController {
2617

27-
private static final String CONTROLLER_NAME = "validation";
28-
29-
@Inject
30-
private DesktopService desktopService;
31-
3218
@Inject
3319
private ValidatePomService validatePomService;
3420

35-
@GET
36-
public ValidationView home() {
37-
return new ValidationView(getCurrentUser(), getCurrentOrganization());
38-
}
39-
40-
@GET
41-
@Path("/validate")
42-
public String validate(@QueryParam("releaseVersion") String releaseVersion,
43-
@QueryParam("nextDevVersion") String nextDevVersion,
44-
@QueryParam("selectedModules") String selectedModules) throws IOException {
45-
Function<Project, String> repoProcessor = project -> {
46-
try {
47-
Repository repo = project.getRepository();
48-
if (!mavenService.isMavenProject(repo)) {
49-
throw new JobException("NO_POM", "No pom.xml for repo " + repo);
50-
}
51-
String[] prepareArgs = {
52-
"-DpreparationGoals=clean",
53-
"-B", // non-interactive batch mode
54-
"release:prepare",
55-
"-Darguments=\"-Dgpg.pinentry-mode=default -DskipTests\"",
56-
"-Dbootique.version=" + releaseVersion,
57-
"-Pgpg", // gpg signing profile
58-
"-Ddummy.version=" + releaseVersion,
59-
"-Dtag=" + releaseVersion,
60-
"-DreleaseVersion=" + releaseVersion,
61-
"-DdevelopmentVersion=" + nextDevVersion,
62-
"-DdryRun=true"
63-
};
64-
desktopService.runMavenCommand(
65-
preferences.get(GitService.BASE_PATH_PREFERENCE).resolve(repo.getName()), prepareArgs
66-
);
67-
return "";
68-
} catch (DesktopException ex) {
69-
throw new JobException(ex.getMessage(), ex);
70-
}
71-
};
72-
startJob(repoProcessor, selectedModules, CONTROLLER_NAME);
73-
return "";
74-
}
75-
7621
@GET
7722
@Path("/pom")
7823
public String validatePom() {

0 commit comments

Comments
 (0)