~kendfinger-deactivatedaccount/jenkins/trunk

« back to all changes in this revision

Viewing changes to maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java

Committer: Kohsuke Kawaguchi
Date: 2013-02-16 19:40:51 UTC
mfrom: (11982.1.19)
Revision ID: git-v1:acd9f2c0407bc2f2a95c7e53c579170658044fe4

Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_de.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_es.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_fi.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_fr.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_hu.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_nl.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_pt_BR.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_ru.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_sv_SE.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_tr.properties

core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_zh_CN.properties

test/src/test/java/lib/form/ComboBoxTest.java

test/src/test/resources/lib/form/ComboBoxTest

test/src/test/resources/lib/form/ComboBoxTest/CompoundField

test/src/test/resources/lib/form/ComboBoxTest/CompoundField/config.jelly

test/src/test/resources/lib/form/ComboBoxTest/CompoundFieldComboBoxBuilder

test/src/test/resources/lib/form/ComboBoxTest/CompoundFieldComboBoxBuilder/config.jelly

files removed:
core/src/main/resources/hudson/model/configure_ru.properties

files modified:
changelog.html

cli/src/main/java/hudson/cli/CLI.java

cli/src/main/java/hudson/cli/CLIConnectionFactory.java

cli/src/main/java/hudson/cli/FullDuplexHttpStream.java

core/src/main/java/hudson/matrix/MatrixConfiguration.java

core/src/main/java/hudson/model/AbstractProject.java

core/src/main/java/hudson/model/Actionable.java

core/src/main/java/hudson/model/ResourceController.java

core/src/main/java/hudson/model/Run.java

core/src/main/java/hudson/model/RunParameterValue.java

core/src/main/java/hudson/model/UpdateCenter.java

core/src/main/java/hudson/model/labels/LabelAtom.java

core/src/main/java/hudson/widgets/BuildHistoryWidget.java

core/src/main/java/jenkins/model/Jenkins.java

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_da.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_de.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_es.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_fi.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_fr.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_hu.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_ja.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_nl.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_pt_BR.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_ru.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_sv_SE.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_tr.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_zh_CN.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fi.properties

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties

core/src/main/resources/jenkins/model/Jenkins/configure_da.properties

core/src/main/resources/jenkins/model/Jenkins/configure_de.properties

core/src/main/resources/jenkins/model/Jenkins/configure_fr.properties

core/src/main/resources/jenkins/model/Jenkins/configure_nl.properties

core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties

core/src/main/resources/jenkins/model/Jenkins/configure_tr.properties

core/src/main/resources/jenkins/model/Jenkins/configure_zh_CN.properties

core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html

core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir_ja.html

core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html

core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir_ja.html

core/src/main/resources/jenkins/model/MasterBuildConfiguration/config_de.properties

core/src/main/resources/jenkins/model/MasterBuildConfiguration/config_fi.properties

core/src/main/resources/jenkins/model/MasterBuildConfiguration/config_hu.properties

core/src/main/resources/lib/form/combobox/combobox.js

core/src/test/java/hudson/model/BuildStatusSummaryTest.java

maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java

maven-plugin/src/main/java/hudson/maven/Maven3Builder.java

test/src/test/java/hudson/model/RunParameterDefinitionTest.java

test/src/test/java/jenkins/model/JenkinsTest.java

war/src/main/webapp/help/parameter/run-project.html

Show diffs side-by-side

added added

removed removed

maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java

199

}

200

}

201

202

protected boolean isDebug() {

203

for(String goal : goals) {

204

if (goal.equals("-X") || goal.equals("--debug")) return true;

205

}

206

return false;

207

}

208

209

protected boolean isQuiet() {

210

for(String goal : goals) {

211

if (goal.equals("-q") || goal.equals("--quiet")) return true;

212

}

213

return false;

214

}

215

202

216

protected static class FilterImpl extends MavenBuildProxy2.Filter<MavenBuildProxy2> implements Serializable {

203

217

204

218

private MavenBuildInformation mavenBuildInformation;

Older »