[jenkins-matrix-project-plugin] 02/02: Merge tag 'upstream/1.3'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Oct 13 08:03:06 BST 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins-matrix-project-plugin.

commit a48d35f58c75052fff67ea83de22f16278601299
Merge: f22bb2e 57a50fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 13 08:47:08 2014 +0200

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3

 .gitignore                                         |   2 +
 pom.xml                                            |  94 ++
 src/main/java/hudson/matrix/Axis.java              | 265 ++++++
 src/main/java/hudson/matrix/AxisDescriptor.java    |  67 ++
 src/main/java/hudson/matrix/AxisList.java          | 108 +++
 src/main/java/hudson/matrix/Combination.java       | 265 ++++++
 .../java/hudson/matrix/DefaultAxisDescriptor.java  |  48 +
 .../matrix/DefaultMatrixExecutionStrategyImpl.java | 303 +++++++
 src/main/java/hudson/matrix/FilterScript.java      | 136 +++
 src/main/java/hudson/matrix/JDKAxis.java           |  72 ++
 src/main/java/hudson/matrix/LabelAxis.java         |  85 ++
 src/main/java/hudson/matrix/LabelExpAxis.java      |  97 ++
 src/main/java/hudson/matrix/Layouter.java          | 225 +++++
 src/main/java/hudson/matrix/LinkedLogRotator.java  |  77 ++
 .../java/hudson/matrix/MatrixAggregatable.java     |  69 ++
 src/main/java/hudson/matrix/MatrixAggregator.java  | 105 +++
 src/main/java/hudson/matrix/MatrixBuild.java       | 410 +++++++++
 src/main/java/hudson/matrix/MatrixChildAction.java |  39 +
 .../java/hudson/matrix/MatrixConfiguration.java    | 432 +++++++++
 .../hudson/matrix/MatrixConfigurationSorter.java   |  36 +
 .../MatrixConfigurationSorterDescriptor.java       |  27 +
 .../hudson/matrix/MatrixExecutionStrategy.java     |  60 ++
 .../matrix/MatrixExecutionStrategyDescriptor.java  |  48 +
 src/main/java/hudson/matrix/MatrixProject.java     | 988 +++++++++++++++++++++
 src/main/java/hudson/matrix/MatrixRun.java         | 186 ++++
 .../matrix/NoopMatrixConfigurationSorter.java      |  33 +
 src/main/java/hudson/matrix/TextAxis.java          |  34 +
 .../matrix/listeners/MatrixBuildListener.java      |  84 ++
 src/main/java/hudson/matrix/package.html           |  27 +
 .../java/hudson/tasks/test/MatrixTestResult.java   |  77 ++
 .../hudson/tasks/test/TestResultAggregator.java    |  60 ++
 .../config.groovy                                  |  28 +
 .../config.properties                              |  24 +
 .../config_da.properties                           |  29 +
 .../config_de.properties                           |  30 +
 .../config_ja.properties                           |  31 +
 .../config_pt_BR.properties                        |  29 +
 .../config_zh_TW.properties                        |  31 +
 .../help-hasTouchStoneCombinationFilter.html       |   5 +
 .../help-hasTouchStoneCombinationFilter_de.html    |  10 +
 .../help-hasTouchStoneCombinationFilter_ja.html    |   5 +
 .../help-hasTouchStoneCombinationFilter_zh_TW.html |   5 +
 .../help-runSequentially.html                      |   5 +
 .../help-runSequentially_de.html                   |   6 +
 .../help-runSequentially_ja.html                   |   4 +
 .../help-runSequentially_zh_TW.html                |   4 +
 .../resources/hudson/matrix/JDKAxis/config.jelly   |  33 +
 .../resources/hudson/matrix/LabelAxis/config.jelly |  66 ++
 .../hudson/matrix/LabelAxis/config_da.properties   |  26 +
 .../hudson/matrix/LabelAxis/config_de.properties   |  26 +
 .../hudson/matrix/LabelAxis/config_es.properties   |  26 +
 .../hudson/matrix/LabelAxis/config_ja.properties   |  26 +
 .../hudson/matrix/LabelAxis/config_pt.properties   |  27 +
 .../matrix/LabelAxis/config_zh_TW.properties       |  26 +
 .../hudson/matrix/LabelAxis/help-labels.html       |  27 +
 .../hudson/matrix/LabelAxis/help-labels_de.html    |  30 +
 .../hudson/matrix/LabelAxis/help-labels_fr.html    |  34 +
 .../hudson/matrix/LabelAxis/help-labels_ja.html    |  23 +
 .../hudson/matrix/LabelAxis/help-labels_nl.html    |  15 +
 .../hudson/matrix/LabelAxis/help-labels_pt_BR.html |  27 +
 .../hudson/matrix/LabelAxis/help-labels_ru.html    |  28 +
 .../hudson/matrix/LabelAxis/help-labels_tr.html    |  26 +
 .../hudson/matrix/LabelAxis/help-labels_zh_TW.html |  21 +
 .../resources/hudson/matrix/LabelAxis/help.html    |   5 +
 .../hudson/matrix/LabelAxis/help_zh_TW.html        |   4 +
 .../hudson/matrix/LabelExpAxis/config.jelly        |  32 +
 .../matrix/LabelExpAxis/config_es.properties       |  24 +
 .../matrix/LabelExpAxis/config_ja.properties       |  25 +
 .../matrix/LabelExpAxis/config_pt.properties       |  25 +
 .../matrix/LabelExpAxis/config_zh_TW.properties    |  24 +
 .../hudson/matrix/LabelExpAxis/help-labelExpr.html |   4 +
 .../matrix/LabelExpAxis/help-labelExpr_ja.html     |   4 +
 .../matrix/LabelExpAxis/help-labelExpr_zh_TW.html  |   4 +
 .../resources/hudson/matrix/LabelExpAxis/help.html |   4 +
 .../hudson/matrix/LabelExpAxis/help_ja.html        |   4 +
 .../hudson/matrix/LabelExpAxis/help_zh_TW.html     |   4 +
 .../hudson/matrix/MatrixBuild/ajaxMatrix.jelly     |  48 +
 .../matrix/MatrixBuild/ajaxMatrix_da.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_de.properties    |   1 +
 .../matrix/MatrixBuild/ajaxMatrix_es.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_fr.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_it.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_ja.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_nl.properties    |   3 +
 .../matrix/MatrixBuild/ajaxMatrix_pt.properties    |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_pt_BR.properties |  23 +
 .../matrix/MatrixBuild/ajaxMatrix_ru.properties    |   4 +
 .../matrix/MatrixBuild/ajaxMatrix_zh_TW.properties |  23 +
 .../matrix/MatrixBuild/confirmDeleteAll.jelly      |  43 +
 .../matrix/MatrixBuild/confirmDeleteAll.properties |  23 +
 .../MatrixBuild/confirmDeleteAll_de.properties     |  25 +
 .../MatrixBuild/confirmDeleteAll_es.properties     |  26 +
 .../MatrixBuild/confirmDeleteAll_ja.properties     |  27 +
 .../MatrixBuild/confirmDeleteAll_pt.properties     |  27 +
 .../MatrixBuild/confirmDeleteAll_ru.properties     |   4 +
 .../MatrixBuild/confirmDeleteAll_zh_TW.properties  |  25 +
 .../hudson/matrix/MatrixBuild/delete.jelly         |  34 +
 .../hudson/matrix/MatrixBuild/delete_ca.properties |   3 +
 .../hudson/matrix/MatrixBuild/delete_cs.properties |   4 +
 .../hudson/matrix/MatrixBuild/delete_de.properties |  24 +
 .../hudson/matrix/MatrixBuild/delete_es.properties |  24 +
 .../hudson/matrix/MatrixBuild/delete_ja.properties |  25 +
 .../hudson/matrix/MatrixBuild/delete_ko.properties |   4 +
 .../hudson/matrix/MatrixBuild/delete_pl.properties |   4 +
 .../hudson/matrix/MatrixBuild/delete_pt.properties |  25 +
 .../matrix/MatrixBuild/delete_pt_BR.properties     |   5 +
 .../hudson/matrix/MatrixBuild/delete_ru.properties |   4 +
 .../matrix/MatrixBuild/delete_zh_CN.properties     |   4 +
 .../matrix/MatrixBuild/delete_zh_TW.properties     |  24 +
 .../resources/hudson/matrix/MatrixBuild/main.jelly |  28 +
 .../matrix/MatrixConfigurationSorter/config.groovy |   1 +
 .../hudson/matrix/MatrixProject/ajaxMatrix.jelly   |  47 +
 .../matrix/MatrixProject/ajaxMatrix_da.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_de.properties  |   1 +
 .../matrix/MatrixProject/ajaxMatrix_es.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_fi.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_fr.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_it.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_ja.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_pl.properties  |  23 +
 .../matrix/MatrixProject/ajaxMatrix_pt.properties  |  24 +
 .../MatrixProject/ajaxMatrix_pt_BR.properties      |  23 +
 .../matrix/MatrixProject/ajaxMatrix_ro.properties  |   3 +
 .../matrix/MatrixProject/ajaxMatrix_ru.properties  |   3 +
 .../MatrixProject/ajaxMatrix_sv_SE.properties      |   3 +
 .../MatrixProject/ajaxMatrix_zh_CN.properties      |  23 +
 .../MatrixProject/ajaxMatrix_zh_TW.properties      |  23 +
 .../matrix/MatrixProject/configure-entries.jelly   |  97 ++
 .../MatrixProject/configure-entries_da.properties  |  27 +
 .../MatrixProject/configure-entries_de.properties  |  30 +
 .../MatrixProject/configure-entries_es.properties  |  32 +
 .../MatrixProject/configure-entries_fr.properties  |  35 +
 .../MatrixProject/configure-entries_ja.properties  |  33 +
 .../MatrixProject/configure-entries_ko.properties  |   6 +
 .../MatrixProject/configure-entries_nl.properties  |  31 +
 .../MatrixProject/configure-entries_pt.properties  |  33 +
 .../configure-entries_pt_BR.properties             |  38 +
 .../MatrixProject/configure-entries_ru.properties  |  33 +
 .../MatrixProject/configure-entries_sk.properties  |   5 +
 .../configure-entries_sv_SE.properties             |   5 +
 .../MatrixProject/configure-entries_tr.properties  |  35 +
 .../configure-entries_zh_TW.properties             |  32 +
 .../MatrixProject/help-childCustomWorkspace.html   |  28 +
 .../help-childCustomWorkspace_zh_TW.html           |  24 +
 .../matrix/MatrixProject/help-slaveAffinity.html   |   9 +
 .../hudson/matrix/MatrixProject/index.jelly        |  62 ++
 .../matrix/MatrixProject/index_ar.properties       |   3 +
 .../matrix/MatrixProject/index_cs.properties       |  23 +
 .../matrix/MatrixProject/index_da.properties       |  23 +
 .../matrix/MatrixProject/index_de.properties       |  24 +
 .../matrix/MatrixProject/index_es.properties       |  25 +
 .../matrix/MatrixProject/index_fi.properties       |  23 +
 .../matrix/MatrixProject/index_fr.properties       |  24 +
 .../matrix/MatrixProject/index_he.properties       |   4 +
 .../matrix/MatrixProject/index_hu.properties       |   3 +
 .../matrix/MatrixProject/index_it.properties       |  23 +
 .../matrix/MatrixProject/index_ja.properties       |  25 +
 .../matrix/MatrixProject/index_ko.properties       |   4 +
 .../matrix/MatrixProject/index_nl.properties       |  23 +
 .../matrix/MatrixProject/index_pl.properties       |  23 +
 .../matrix/MatrixProject/index_pt.properties       |  26 +
 .../matrix/MatrixProject/index_pt_BR.properties    |  25 +
 .../matrix/MatrixProject/index_ro.properties       |   4 +
 .../matrix/MatrixProject/index_ru.properties       |  24 +
 .../matrix/MatrixProject/index_sv_SE.properties    |   4 +
 .../matrix/MatrixProject/index_tr.properties       |  23 +
 .../matrix/MatrixProject/index_uk.properties       |   4 +
 .../matrix/MatrixProject/index_zh_CN.properties    |  23 +
 .../matrix/MatrixProject/index_zh_TW.properties    |  26 +
 .../hudson/matrix/MatrixProject/newJobDetail.jelly |  28 +
 .../matrix/MatrixProject/newJobDetail.properties   |  25 +
 .../MatrixProject/newJobDetail_ar.properties       |   3 +
 .../MatrixProject/newJobDetail_da.properties       |  23 +
 .../MatrixProject/newJobDetail_de.properties       |  27 +
 .../MatrixProject/newJobDetail_es.properties       |  26 +
 .../MatrixProject/newJobDetail_et.properties       |   3 +
 .../MatrixProject/newJobDetail_fi.properties       |   3 +
 .../MatrixProject/newJobDetail_fr.properties       |  26 +
 .../MatrixProject/newJobDetail_hi_IN.properties    |   3 +
 .../MatrixProject/newJobDetail_it.properties       |  23 +
 .../MatrixProject/newJobDetail_ja.properties       |  24 +
 .../MatrixProject/newJobDetail_ko.properties       |  23 +
 .../MatrixProject/newJobDetail_nb_NO.properties    |  23 +
 .../MatrixProject/newJobDetail_nl.properties       |  23 +
 .../MatrixProject/newJobDetail_pl.properties       |  23 +
 .../MatrixProject/newJobDetail_pt.properties       |  26 +
 .../MatrixProject/newJobDetail_pt_BR.properties    |  23 +
 .../MatrixProject/newJobDetail_ru.properties       |  23 +
 .../MatrixProject/newJobDetail_sv_SE.properties    |  23 +
 .../MatrixProject/newJobDetail_tr.properties       |  23 +
 .../MatrixProject/newJobDetail_uk.properties       |   3 +
 .../MatrixProject/newJobDetail_zh_CN.properties    |  23 +
 .../MatrixProject/newJobDetail_zh_TW.properties    |  24 +
 .../resources/hudson/matrix/Messages.properties    |  41 +
 .../resources/hudson/matrix/Messages_da.properties |  33 +
 .../resources/hudson/matrix/Messages_de.properties |  40 +
 .../resources/hudson/matrix/Messages_es.properties |  39 +
 .../resources/hudson/matrix/Messages_fr.properties |  30 +
 .../resources/hudson/matrix/Messages_ja.properties |  40 +
 .../resources/hudson/matrix/Messages_nl.properties |  31 +
 .../resources/hudson/matrix/Messages_pt.properties |  40 +
 .../hudson/matrix/Messages_pt_BR.properties        |  42 +
 .../resources/hudson/matrix/Messages_ru.properties |  30 +
 .../resources/hudson/matrix/Messages_tr.properties |  31 +
 .../hudson/matrix/Messages_zh_CN.properties        |  37 +
 .../hudson/matrix/Messages_zh_TW.properties        |  39 +
 .../resources/hudson/matrix/TextAxis/config.jelly  |  32 +
 .../hudson/matrix/TextAxis/config_da.properties    |  24 +
 .../hudson/matrix/TextAxis/config_de.properties    |  24 +
 .../hudson/matrix/TextAxis/config_es.properties    |  24 +
 .../hudson/matrix/TextAxis/config_ja.properties    |  24 +
 .../hudson/matrix/TextAxis/config_pt.properties    |  24 +
 .../hudson/matrix/TextAxis/config_zh_TW.properties |  24 +
 .../hudson/matrix/TextAxis/help-valueString.html   |   4 +
 .../matrix/TextAxis/help-valueString_de.html       |   5 +
 .../matrix/TextAxis/help-valueString_fr.html       |   4 +
 .../matrix/TextAxis/help-valueString_ja.html       |   4 +
 .../matrix/TextAxis/help-valueString_nl.html       |   3 +
 .../matrix/TextAxis/help-valueString_pt_BR.html    |   3 +
 .../matrix/TextAxis/help-valueString_ru.html       |   3 +
 .../matrix/TextAxis/help-valueString_tr.html       |   3 +
 .../matrix/TextAxis/help-valueString_zh_TW.html    |   4 +
 .../hudson/tasks/test/MatrixTestResult/index.jelly |  72 ++
 src/main/resources/index.jelly                     |  29 +
 .../lib/hudson/matrix-project/matrix.jelly         | 103 +++
 .../lib/hudson/matrix-project/matrix_ar.properties |   3 +
 .../lib/hudson/matrix-project/matrix_cs.properties |  23 +
 .../lib/hudson/matrix-project/matrix_da.properties |  24 +
 .../lib/hudson/matrix-project/matrix_de.properties |  24 +
 .../lib/hudson/matrix-project/matrix_es.properties |  24 +
 .../lib/hudson/matrix-project/matrix_fi.properties |  23 +
 .../lib/hudson/matrix-project/matrix_fr.properties |  24 +
 .../lib/hudson/matrix-project/matrix_he.properties |   3 +
 .../lib/hudson/matrix-project/matrix_it.properties |  23 +
 .../lib/hudson/matrix-project/matrix_ja.properties |  24 +
 .../lib/hudson/matrix-project/matrix_ko.properties |   3 +
 .../lib/hudson/matrix-project/matrix_nl.properties |  24 +
 .../lib/hudson/matrix-project/matrix_pl.properties |  24 +
 .../hudson/matrix-project/matrix_pt_BR.properties  |  24 +
 .../hudson/matrix-project/matrix_pt_PT.properties  |  23 +
 .../lib/hudson/matrix-project/matrix_ro.properties |   3 +
 .../lib/hudson/matrix-project/matrix_ru.properties |  24 +
 .../hudson/matrix-project/matrix_sv_SE.properties  |   4 +
 .../lib/hudson/matrix-project/matrix_tr.properties |  24 +
 .../lib/hudson/matrix-project/matrix_uk.properties |   3 +
 .../hudson/matrix-project/matrix_zh_CN.properties  |  23 +
 .../hudson/matrix-project/matrix_zh_TW.properties  |  24 +
 .../resources/lib/hudson/matrix-project/taglib     |   0
 src/main/webapp/help/matrix/axes.html              |  22 +
 src/main/webapp/help/matrix/axes_de.html           |  24 +
 src/main/webapp/help/matrix/axes_fr.html           |  30 +
 src/main/webapp/help/matrix/axes_ja.html           |  21 +
 src/main/webapp/help/matrix/axes_nl.html           |  15 +
 src/main/webapp/help/matrix/axes_pt_BR.html        |  22 +
 src/main/webapp/help/matrix/axes_ru.html           |  24 +
 src/main/webapp/help/matrix/axes_tr.html           |  20 +
 src/main/webapp/help/matrix/axes_zh_TW.html        |  21 +
 src/main/webapp/help/matrix/combinationfilter.html |  54 ++
 .../webapp/help/matrix/combinationfilter_de.html   |  55 ++
 .../webapp/help/matrix/combinationfilter_fr.html   |  54 ++
 .../webapp/help/matrix/combinationfilter_ja.html   |  49 +
 .../help/matrix/combinationfilter_zh_TW.html       |  47 +
 src/main/webapp/help/matrix/jdk.html               |  12 +
 src/main/webapp/help/matrix/jdk_de.html            |  15 +
 src/main/webapp/help/matrix/jdk_fr.html            |  15 +
 src/main/webapp/help/matrix/jdk_ja.html            |  10 +
 src/main/webapp/help/matrix/jdk_nl.html            |   8 +
 src/main/webapp/help/matrix/jdk_pt_BR.html         |  12 +
 src/main/webapp/help/matrix/jdk_ru.html            |  13 +
 src/main/webapp/help/matrix/jdk_tr.html            |  11 +
 src/main/webapp/help/matrix/jdk_zh_TW.html         |  10 +
 .../matrix/MatrixProjectCustomWorkspaceTest.groovy | 147 +++
 .../groovy/hudson/matrix/MatrixProjectTest.groovy  | 522 +++++++++++
 .../CombinationFilterUsingBuildParamsTest.java     | 304 +++++++
 src/test/java/hudson/matrix/CombinationTest.java   |  62 ++
 .../matrix/MatrixConfigurationSorterTest.java      |  48 +
 .../hudson/matrix/MatrixProjectDependencyTest.java |  41 +
 src/test/java/hudson/matrix/MatrixRunTest.java     |  55 ++
 src/test/java/hudson/matrix/MatrixTest.java        |  76 ++
 .../MatrixProjectTest/testUpgrade/config.xml       |   1 +
 .../testUpgrade/jobs/x/config.xml                  |  19 +
 src/test/resources/hudson/matrix/echo-property.pom |  70 ++
 src/test/resources/hudson/matrix/runMatrix.xml     |  39 +
 283 files changed, 11129 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-matrix-project-plugin.git



More information about the pkg-java-commits mailing list