diff --git a/pom.xml b/pom.xml
index 7cd322f..7edcc03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,24 +70,20 @@
- 6.7.1
+ 7.2.3
- 6.2.9
- 1.6.4
- 4.0.3.201509231615-r
+ 8.0.0-m2
+ 1.7.3
+ 5.0.3.201809091024-r
central.maven.org
- http://central.maven.org/maven2
-
-
- repo1.maven.org
- http://repo1.maven.org/maven2
+ https://mvnrepository.com/repos/central
jenkins-releases
@@ -101,12 +97,25 @@
jfrog-libs-releases
http://repo.jfrog.org/artifactory/libs-releases
+
+ attlasian
+ https://maven.atlassian.com/3rdparty/
+
+
+ spring
+ https://repo.spring.io/libs-milestone/
+
+
+ spring-plugins
+ https://repo.spring.io/plugins-release/
+
+
- repo1.maven.org
- http://repo1.maven.org/maven2
+ central.maven.org
+ https://org.apache.maven.plugins
jfrog-libs-releases
@@ -115,6 +124,13 @@
+
+ com.oracle
+ ojdbc
+ 11.2.0
+ system
+
+
commons-logging
commons-logging
@@ -245,19 +261,22 @@
com.atlassian.maven.plugins
maven-bamboo-plugin
- ${amps.version}
+ 5.0.18
true
- ${bamboo.version}
- ${bamboo.version}
+ 5.0.18
+ 5.0.18
+ org.apache.maven.plugins
maven-compiler-plugin
+ 2.5
1.8
1.8
+ UTF-8
diff --git a/src/main/java/com/houghtonassociates/bamboo/plugins/GerritRepositoryAdapter.java b/src/main/java/com/houghtonassociates/bamboo/plugins/GerritRepositoryAdapter.java
index 1d0c84d..67f4dad 100644
--- a/src/main/java/com/houghtonassociates/bamboo/plugins/GerritRepositoryAdapter.java
+++ b/src/main/java/com/houghtonassociates/bamboo/plugins/GerritRepositoryAdapter.java
@@ -921,7 +921,7 @@ public BuildLoggerManager getBuildLoggerManager() {
new BuildRepositoryChangesImpl(change.getLastRevision(), commits);
if (!this.getVcsBranch().isEqualToBranchWith(change.getBranch()))
- buildChanges.setOverriddenVcsBranch(this.getVcsBranch());
+ buildChanges.setActualBranch(this.getVcsBranch());
bandanaManager.setValue(PlanAwareBandanaContext.GLOBAL_CONTEXT,
change.getId(), change.getLastRevision());
@@ -1124,7 +1124,7 @@ private boolean isOnLocalAgent() {
String vcsRevisionKey,
File sourceDirectory, int depth) throws RepositoryException {
String originalVcsRevisionKey = vcsRevisionKey;
- PlanKey actualKey = PlanKeys.getPlanKey(buildContext.getPlanKey());
+ PlanKey actualKey = buildContext.getTypedPlanKey();
final BuildLogger buildLogger = buildLoggerManager.getLogger(actualKey);
final boolean doShallowFetch =
USE_SHALLOW_CLONES && gc.isUseShallowClones() && depth == 1;
@@ -1376,8 +1376,7 @@ public CommitContext getFirstCommit() throws RepositoryException {
public void
createBranch(long repositoryId, String branchName,
BuildContext buildContext) throws RepositoryException {
- PlanKey planKey = PlanKeys.getPlanKey(buildContext.getPlanKey());
-
+ PlanKey planKey = buildContext.getTypedPlanKey();
if (planKey != null) {
JGitRepository jgitRepo = new JGitRepository();
diff --git a/src/main/java/com/houghtonassociates/bamboo/plugins/processor/GerritProcessor.java b/src/main/java/com/houghtonassociates/bamboo/plugins/processor/GerritProcessor.java
index d6f77ac..811aca0 100644
--- a/src/main/java/com/houghtonassociates/bamboo/plugins/processor/GerritProcessor.java
+++ b/src/main/java/com/houghtonassociates/bamboo/plugins/processor/GerritProcessor.java
@@ -1,12 +1,12 @@
/**
* Copyright 2012 Houghton Associates
- *
+ *
* 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
- *
+ *
* http://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.
@@ -15,11 +15,9 @@
*/
package com.houghtonassociates.bamboo.plugins.processor;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
+import com.atlassian.bamboo.plan.Plan;
+import com.atlassian.bamboo.repository.RepositoryException;
+import com.atlassian.bamboo.vcs.configuration.PlanRepositoryDefinition;
import org.apache.log4j.Logger;
import com.atlassian.bamboo.build.CustomBuildProcessor;
@@ -27,9 +25,6 @@
import com.atlassian.bamboo.builder.BuildState;
import com.atlassian.bamboo.configuration.AdministrationConfiguration;
import com.atlassian.bamboo.configuration.AdministrationConfigurationAccessor;
-import com.atlassian.bamboo.plan.Plan;
-import com.atlassian.bamboo.repository.RepositoryDefinition;
-import com.atlassian.bamboo.repository.RepositoryException;
import com.atlassian.bamboo.utils.error.ErrorCollection;
import com.atlassian.bamboo.utils.i18n.I18nBeanFactory;
import com.atlassian.bamboo.utils.i18n.TextProviderAdapter;
@@ -43,6 +38,11 @@
import com.houghtonassociates.bamboo.plugins.dao.GerritService;
import com.opensymphony.xwork2.TextProvider;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Post processor which updates Gerrit after build completes
*/
@@ -62,10 +62,6 @@ public class GerritProcessor extends BaseConfigurableBuildPlugin implements
@Override
public void init(BuildContext buildContext) {
super.init(buildContext);
-
- final List repositories =
- buildContext.getRepositoryDefinitions();
-
this.customConfiguration =
buildContext.getBuildDefinition().getCustomConfiguration();
}
@@ -164,42 +160,35 @@ private String buildStatusString(CurrentBuildResult results) {
}
@Override
- public BuildContext call() throws InterruptedException, Exception {
- final String buildPlanKey = buildContext.getPlanKey();
+ public BuildContext call() throws Exception {
final CurrentBuildResult results = buildContext.getBuildResult();
final Boolean runVerification =
Boolean.parseBoolean(customConfiguration.get(GERRIT_RUN));
-
- logger.info("Run verification: " + runVerification);
-
+ List repos = buildContext.getVcsRepositories();
if (runVerification) {
- final List repositories =
- buildContext.getRepositoryDefinitions();
-
- for (RepositoryDefinition rd : repositories) {
- if (rd.getRepository() instanceof GerritRepositoryAdapter) {
+ for (PlanRepositoryDefinition rd : repos) {
+ if (rd.asLegacyData().getRepository().getClass().isAssignableFrom(GerritRepositoryAdapter.class)) {
logger.info("Updating Change Verification...");
- updateChangeVerification(rd, buildPlanKey, results);
+ updateChangeVerification(rd, results);
}
}
}
-
return buildContext;
}
private void
- updateChangeVerification(RepositoryDefinition rd,
- String buildPlanKey,
+ updateChangeVerification(PlanRepositoryDefinition rd,
CurrentBuildResult results) throws RepositoryException {
+ Long id = rd.asLegacyData().getId();
final GerritRepositoryAdapter gra =
- (GerritRepositoryAdapter) rd.getRepository();
+ (GerritRepositoryAdapter) rd.asLegacyData().getRepository();
String revNumber =
results.getCustomBuildData().get("repository.revision.number");
final String vcsRevision =
- buildContext.getBuildChanges().getVcsRevisionKey(rd.getId());
+ buildContext.getBuildChanges().getVcsRevisionKey(id);
final String prevVcsRevision =
buildContext.getBuildChanges()
- .getPreviousVcsRevisionKey(rd.getId());
+ .getPreviousVcsRevisionKey(id);
final GerritService service = gra.getGerritDAO();
diff --git a/src/main/java/com/houghtonassociates/bamboo/plugins/view/ViewGerritChainResultsAction.java b/src/main/java/com/houghtonassociates/bamboo/plugins/view/ViewGerritChainResultsAction.java
index 4d0074f..be4ec56 100644
--- a/src/main/java/com/houghtonassociates/bamboo/plugins/view/ViewGerritChainResultsAction.java
+++ b/src/main/java/com/houghtonassociates/bamboo/plugins/view/ViewGerritChainResultsAction.java
@@ -22,6 +22,7 @@
import com.atlassian.bamboo.resultsummary.ResultSummaryPredicates;
import com.atlassian.bamboo.storage.StorageLocationService;
+import com.atlassian.spring.container.ContainerManager;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -176,7 +177,11 @@ public FilteredTestResults getFilteredTestResults() {
public boolean isLogAccessible(BuildResultsSummary jobResults) {
if (jobResults != null) {
- File logFile = new File(BuildLogUtils.getLogFileDirectory(jobResults.getPlanKey()), BuildLogUtils.getLogFileName(jobResults.getPlanKey(), jobResults.getBuildNumber()));
+
+ final StorageLocationService storageLocationService = (StorageLocationService) ContainerManager.
+ getComponent("storageLocationService");
+ File logFile = new File(storageLocationService.getBuildLogsDirectory(jobResults.getPlanKey()),
+ storageLocationService.getLogFileName(jobResults.getPlanKey(), Long.valueOf(jobResults.getBuildNumber())));
return logFile.canRead();
}
return false;
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index a1fe9b0..d54e1e6 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -96,7 +96,7 @@
-
+