From aa4058f4b8df9d86a444a6ed80d87a8b3ffcdb1d Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 15 Mar 2016 16:49:52 +1000 Subject: [PATCH 1/4] chore(dependency): Update zanata-parent to 27-SNAPSHOT, args4j to 2.32 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 447347e5..b1f46c0b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.zanata zanata-parent - 26-SNAPSHOT + 27-SNAPSHOT ../parent @@ -145,7 +145,7 @@ args4j args4j - 2.0.23 + 2.32 From 5f5f7957e678979dac7a2f82dffb53ab254d3c6d Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 16 Mar 2016 16:41:47 +1000 Subject: [PATCH 2/4] fix(staticAnalysis): fix the failed -DstaticAnalysis --- pom.xml | 3 --- zanata-maven-plugin/demo-glossary/compendium/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/csv/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/delete/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/fuel/pom.xml | 2 +- zanata-maven-plugin/demo-props/pom.xml | 2 +- zanata-maven-plugin/demo-publican/pom.xml | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index b1f46c0b..3b865b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - -Xdoclint:none - org.codehaus.mojo diff --git a/zanata-maven-plugin/demo-glossary/compendium/pom.xml b/zanata-maven-plugin/demo-glossary/compendium/pom.xml index 19d74e18..54cfa435 100644 --- a/zanata-maven-plugin/demo-glossary/compendium/pom.xml +++ b/zanata-maven-plugin/demo-glossary/compendium/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} fr.po pl diff --git a/zanata-maven-plugin/demo-glossary/csv/pom.xml b/zanata-maven-plugin/demo-glossary/csv/pom.xml index bbaebefd..b9708a7f 100644 --- a/zanata-maven-plugin/demo-glossary/csv/pom.xml +++ b/zanata-maven-plugin/demo-glossary/csv/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} translate1.csv diff --git a/zanata-maven-plugin/demo-glossary/delete/pom.xml b/zanata-maven-plugin/demo-glossary/delete/pom.xml index 48d0ba22..f2d77eb7 100644 --- a/zanata-maven-plugin/demo-glossary/delete/pom.xml +++ b/zanata-maven-plugin/demo-glossary/delete/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} zh true diff --git a/zanata-maven-plugin/demo-glossary/fuel/pom.xml b/zanata-maven-plugin/demo-glossary/fuel/pom.xml index fd355c5e..49de8bb5 100644 --- a/zanata-maven-plugin/demo-glossary/fuel/pom.xml +++ b/zanata-maven-plugin/demo-glossary/fuel/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} fuel_hi.po hi diff --git a/zanata-maven-plugin/demo-props/pom.xml b/zanata-maven-plugin/demo-props/pom.xml index c7823a73..9c6b208c 100644 --- a/zanata-maven-plugin/demo-props/pom.xml +++ b/zanata-maven-plugin/demo-props/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} properties ${zanata.srcDir} diff --git a/zanata-maven-plugin/demo-publican/pom.xml b/zanata-maven-plugin/demo-publican/pom.xml index d1164269..ac9eeeaf 100644 --- a/zanata-maven-plugin/demo-publican/pom.xml +++ b/zanata-maven-plugin/demo-publican/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + ${project.version} ${zanata.srcDir} ${zanata.transDir} From e3cd8b91811b9462e0d016ea7878e7c449eacaca Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 16 Mar 2016 18:15:49 +1000 Subject: [PATCH 3/4] fix(version): revert the version to 3.8.1 because it is not part of the normal reactor build --- zanata-maven-plugin/demo-props/pom.xml | 2 +- zanata-maven-plugin/demo-publican/pom.xml | 2 +- zanata-maven-plugin/demo-xliff/pom.xml | 2 +- zanata-maven-plugin/demo-xml/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zanata-maven-plugin/demo-props/pom.xml b/zanata-maven-plugin/demo-props/pom.xml index 9c6b208c..c7ea0fa2 100644 --- a/zanata-maven-plugin/demo-props/pom.xml +++ b/zanata-maven-plugin/demo-props/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 properties ${zanata.srcDir} diff --git a/zanata-maven-plugin/demo-publican/pom.xml b/zanata-maven-plugin/demo-publican/pom.xml index ac9eeeaf..bbf87c44 100644 --- a/zanata-maven-plugin/demo-publican/pom.xml +++ b/zanata-maven-plugin/demo-publican/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 ${zanata.srcDir} ${zanata.transDir} diff --git a/zanata-maven-plugin/demo-xliff/pom.xml b/zanata-maven-plugin/demo-xliff/pom.xml index f07edde7..8866771d 100644 --- a/zanata-maven-plugin/demo-xliff/pom.xml +++ b/zanata-maven-plugin/demo-xliff/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + 3.8.1 xliff ${zanata.srcDir} diff --git a/zanata-maven-plugin/demo-xml/pom.xml b/zanata-maven-plugin/demo-xml/pom.xml index b7440ed8..3a0c4936 100644 --- a/zanata-maven-plugin/demo-xml/pom.xml +++ b/zanata-maven-plugin/demo-xml/pom.xml @@ -14,7 +14,7 @@ org.zanata zanata-maven-plugin - 3.8.0 + 3.8.1 xml ${zanata.srcDir} From 3122388044eafc67d42ad036be6d84cd543c8040 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 17 Mar 2016 10:36:56 +1000 Subject: [PATCH 4/4] fix(demo): Revert back the version --- zanata-maven-plugin/demo-glossary/compendium/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/csv/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/delete/pom.xml | 2 +- zanata-maven-plugin/demo-glossary/fuel/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zanata-maven-plugin/demo-glossary/compendium/pom.xml b/zanata-maven-plugin/demo-glossary/compendium/pom.xml index 54cfa435..0bfc8fd7 100644 --- a/zanata-maven-plugin/demo-glossary/compendium/pom.xml +++ b/zanata-maven-plugin/demo-glossary/compendium/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 fr.po pl diff --git a/zanata-maven-plugin/demo-glossary/csv/pom.xml b/zanata-maven-plugin/demo-glossary/csv/pom.xml index b9708a7f..06c76dd6 100644 --- a/zanata-maven-plugin/demo-glossary/csv/pom.xml +++ b/zanata-maven-plugin/demo-glossary/csv/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 translate1.csv diff --git a/zanata-maven-plugin/demo-glossary/delete/pom.xml b/zanata-maven-plugin/demo-glossary/delete/pom.xml index f2d77eb7..413f02b4 100644 --- a/zanata-maven-plugin/demo-glossary/delete/pom.xml +++ b/zanata-maven-plugin/demo-glossary/delete/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 zh true diff --git a/zanata-maven-plugin/demo-glossary/fuel/pom.xml b/zanata-maven-plugin/demo-glossary/fuel/pom.xml index 49de8bb5..b07b4739 100644 --- a/zanata-maven-plugin/demo-glossary/fuel/pom.xml +++ b/zanata-maven-plugin/demo-glossary/fuel/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - ${project.version} + 3.8.1 fuel_hi.po hi