From 7625d2f994c59292e49aeb9238a613d8829348d3 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 30 Jun 2015 23:40:29 +1000 Subject: [PATCH 01/22] Correct version of sub modules --- pom.xml | 4 ++-- 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-publican/pom.xml | 2 +- zanata-maven-plugin/demo-xliff/pom.xml | 2 +- zanata-maven-plugin/sample-scripts/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index b6c01bfb..2fa3fca0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,8 @@ - 3.7.2 - 3.7.1 + 3.7.3 + 3.7.2 3.0.1.Final 1.17.1 diff --git a/zanata-maven-plugin/demo-glossary/compendium/pom.xml b/zanata-maven-plugin/demo-glossary/compendium/pom.xml index b65cf5d2..2f9706dc 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 - 1.5-SNAPSHOT + 3.7.2-SNAPSHOT fr.po pl diff --git a/zanata-maven-plugin/demo-glossary/csv/pom.xml b/zanata-maven-plugin/demo-glossary/csv/pom.xml index 85c4273f..5c40d2ab 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 - 1.5-SNAPSHOT + 3.7.2-SNAPSHOT translate1.csv diff --git a/zanata-maven-plugin/demo-glossary/delete/pom.xml b/zanata-maven-plugin/demo-glossary/delete/pom.xml index 14d49e21..7b5b55ac 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 - 1.8.0-SNAPSHOT + 3.7.2-SNAPSHOT zh true diff --git a/zanata-maven-plugin/demo-glossary/fuel/pom.xml b/zanata-maven-plugin/demo-glossary/fuel/pom.xml index b27a429d..bf7d3b6d 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 - 1.8.0-SNAPSHOT + 3.7.2-SNAPSHOT fuel_hi.po hi diff --git a/zanata-maven-plugin/demo-publican/pom.xml b/zanata-maven-plugin/demo-publican/pom.xml index 22f85f5a..e613b831 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 - 1.5-SNAPSHOT + 3.7.2-SNAPSHOT ${zanata.srcDir} ${zanata.transDir} diff --git a/zanata-maven-plugin/demo-xliff/pom.xml b/zanata-maven-plugin/demo-xliff/pom.xml index 1f1fe5d2..59c3aef6 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 - 1.5-SNAPSHOT + 3.7.2-SNAPSHOT xliff ${zanata.srcDir} diff --git a/zanata-maven-plugin/sample-scripts/pom.xml b/zanata-maven-plugin/sample-scripts/pom.xml index d05d65f3..34468696 100644 --- a/zanata-maven-plugin/sample-scripts/pom.xml +++ b/zanata-maven-plugin/sample-scripts/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 1.4.4 + 3.7.2-SNAPSHOT . From be6deaa6610c50f21f2ba50fd5fbdbe73acb2328 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 1 Jul 2015 13:04:46 +1000 Subject: [PATCH 02/22] [maven-release-plugin] prepare release client-3.7.2 --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 2fa3fca0..0380fa8b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.2-SNAPSHOT + 3.7.2 Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 diff --git a/stub-server/pom.xml b/stub-server/pom.xml index b41b9fd4..ba29d772 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2-SNAPSHOT + 3.7.2 stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 07c8738b..0832ee9c 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2-SNAPSHOT + 3.7.2 zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 00f488fc..4bf0b2be 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2-SNAPSHOT + 3.7.2 zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index d7d73e49..ba09770d 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2-SNAPSHOT + 3.7.2 zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index 0f5e616e..e3538e94 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.2-SNAPSHOT + 3.7.2 jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.2 From e39e38aec687a32bb4ea57dbe65a4aa12a088aed Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 1 Jul 2015 13:04:54 +1000 Subject: [PATCH 03/22] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 0380fa8b..d6d28f40 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.2 + 3.7.3-SNAPSHOT Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD diff --git a/stub-server/pom.xml b/stub-server/pom.xml index ba29d772..78e61f43 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2 + 3.7.3-SNAPSHOT stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 0832ee9c..8df1b3b0 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2 + 3.7.3-SNAPSHOT zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 4bf0b2be..2329021c 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2 + 3.7.3-SNAPSHOT zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index ba09770d..66fbbd8e 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.2 + 3.7.3-SNAPSHOT zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index e3538e94..551854a9 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.2 + 3.7.3-SNAPSHOT jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.2 + HEAD From aa7d429a4b859b72307b0d18da02ff08197c94dc Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Thu, 9 Jul 2015 15:55:18 +1000 Subject: [PATCH 04/22] rhbz1241346 - fix file mapping rule JAXB mapping and reduce debug noise --- .../java/org/zanata/client/commands/FileMappingRuleHandler.java | 2 ++ .../main/java/org/zanata/client/commands/PushPullCommand.java | 2 +- .../src/main/java/org/zanata/client/config/FileMappingRule.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java index b9a9d69c..51b0780d 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java @@ -90,6 +90,8 @@ public boolean isApplicable(QualifiedSrcDocName qualifiedSrcDocName) { File srcFile = new File(opts.getSrcDir(), qualifiedSrcDocName.getFullName()); + log.debug("trying to match pattern: {} to file: {}", + mappingRule.getPattern(), srcFile.getPath()); return matcher.matches(Paths.get(srcFile.getPath())); } diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java index 9a425fd4..3a642ca6 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java @@ -108,7 +108,7 @@ protected void confirmWithUser(String message) throws IOException { protected void debug(Object jaxbElement) { try { - if (getOpts().isDebugSet()) { + if (getOpts().isDebugSet() && getOpts().getLogHttp()) { StringWriter writer = new StringWriter(); getMarshaller().marshal(jaxbElement, writer); log.debug("{}", writer); diff --git a/zanata-client-commands/src/main/java/org/zanata/client/config/FileMappingRule.java b/zanata-client-commands/src/main/java/org/zanata/client/config/FileMappingRule.java index 6b696984..8f44eee7 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/config/FileMappingRule.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/config/FileMappingRule.java @@ -75,7 +75,7 @@ public FileMappingRule(String rule) { /** * Represents glob pattern to files that are applicable for this rule. */ - @XmlAttribute(name = "apply-to", required = false) + @XmlAttribute(name = "pattern", required = false) @XmlJavaTypeAdapter(StringTrimAdapter.class) public String getPattern() { return pattern; From f3d2b70b78eab89fb156dfde70496046bf5e00ee Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 13 Jul 2015 16:08:50 +1000 Subject: [PATCH 05/22] [maven-release-plugin] prepare release client-3.7.3 --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d6d28f40..f56bec86 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.3-SNAPSHOT + 3.7.3 Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 diff --git a/stub-server/pom.xml b/stub-server/pom.xml index 78e61f43..4e99d7c8 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3-SNAPSHOT + 3.7.3 stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 8df1b3b0..93fa9953 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3-SNAPSHOT + 3.7.3 zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 2329021c..68e214a8 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3-SNAPSHOT + 3.7.3 zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index 66fbbd8e..f9d33e7f 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3-SNAPSHOT + 3.7.3 zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index 551854a9..c98af573 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.3-SNAPSHOT + 3.7.3 jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.3 From bf8cdb330c2915999ae619d7e86100bb8c2ca4d9 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 13 Jul 2015 16:08:57 +1000 Subject: [PATCH 06/22] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f56bec86..2e1ac26f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.3 + 3.7.4-SNAPSHOT Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD diff --git a/stub-server/pom.xml b/stub-server/pom.xml index 4e99d7c8..ac14dca3 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3 + 3.7.4-SNAPSHOT stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 93fa9953..621395e5 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3 + 3.7.4-SNAPSHOT zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 68e214a8..d1accba9 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3 + 3.7.4-SNAPSHOT zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index f9d33e7f..de476978 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.3 + 3.7.4-SNAPSHOT zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index c98af573..22598966 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.3 + 3.7.4-SNAPSHOT jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.3 + HEAD From be75556a16937eff85896ba864e1c8af8d8b6b9e Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 21 Jul 2015 17:22:23 +1000 Subject: [PATCH 07/22] fix(ux,doc): update doc regarding file mapping rule and add log for unmatched file --- docs/configuration.md | 12 +++++++----- .../zanata/client/commands/TransFileResolver.java | 9 +++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index e893a1fe..154de1f5 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -82,13 +82,15 @@ You can also customize the way translation files are found when pushing, as well In the example above, `pattern` identifies a source file, and the contents of the `rule` element specify how translation files will be stored. -The `pattern` attribute is a [glob](http://en.wikipedia.org/wiki/Glob_(programming)) matching pattern to your source document file(s). You can define more than one rule and apply each rule to a specific set of source documents using different patterns. The **first** matched rule will be applied to the file. +The `pattern` attribute is a [glob](http://en.wikipedia.org/wiki/Glob_(programming)) matching pattern to your source document file(s). You can define more than one rule and apply each rule to a specific set of source documents using different patterns. The **first** matched rule will be applied to the file. + +Please note `pattern` value will be tested against file path relative to project root, not src-dir. `pattern` is optional. If not specified, the rule will be applied to all source documents in your project. The actual rule consists of literal path and placeholders/variables. Supported placeholders/variables are: - + 1. **{path}** is the path between source document root (what you define as src-dir option) and the final file. 1. **{filename}** the source document name without leading path and extension. 1. **{locale}** the locale for the translation file. If you use "map-from" argument in your locale mapping, this will be the map-from value. @@ -128,9 +130,9 @@ Explanation: Since you have defined `` as `templates`, the source docum {extension} = 'pot' ``` -> **NOTE** the relative path `messages/kdeedu/kalzium.pot` will be the document's unique identifier inside Zanata. -> If you change `src-dir` setting later, e.g. to ".", which results in a change of the relative path to `templates/messages/kdeedu/kalzium.pot`, -> pushing again will create a new document with the new path as its unique identifier, and the old document will be considered obsolete and will not be visible to anyone. +> **NOTE** the relative path `messages/kdeedu/kalzium.pot` will be the document's unique identifier inside Zanata. +> If you change `src-dir` setting later, e.g. to ".", which results in a change of the relative path to `templates/messages/kdeedu/kalzium.pot`, +> pushing again will create a new document with the new path as its unique identifier, and the old document will be considered obsolete and will not be visible to anyone. > The old document's translations will not be copied to the new document automatically, but they will appear as Translation Memory matches. This can be confusing and frustrating for translators. As the rule is defined as `{locale}/{path}/{filename}.po`, for locale `de-DE`, diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java index 96baf5fa..ac7207f2 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java @@ -24,6 +24,8 @@ import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.zanata.client.config.FileMappingRule; import org.zanata.client.config.LocaleMapping; import org.zanata.common.ProjectType; @@ -44,6 +46,8 @@ * href="mailto:pahuang@redhat.com">pahuang@redhat.com */ public class TransFileResolver { + private static final Logger log = + LoggerFactory.getLogger(TransFileResolver.class); private final ConfigurableProjectOptions opts; private static final Map PROJECT_TYPE_FILE_MAPPING_RULES = @@ -147,6 +151,11 @@ private Optional tryGetTransFileFromProjectMappingRules( return Optional.of(new File(opts.getTransDir(), relativePath)); } } + if (fileMappingRules.size() > 0) { + log.warn( + "None of the file mapping rule is applicable for {}. Please make sure your mapping is correct.", + qualifiedSrcDocName.getFullName()); + } return Optional.absent(); } From bccdff97f6cfa2aae5efe951373c9a065ffe31d9 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 18 Jun 2015 14:50:24 +1000 Subject: [PATCH 08/22] Add doc for 0install --- docs/0install/setup.md | 17 +++++++++++++++++ docs/installation.md | 41 ++++++++++++++++++++++++++++++++++++++-- docs/ivy/installation.md | 12 ------------ mkdocs.yml | 5 ++--- 4 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 docs/0install/setup.md delete mode 100644 docs/ivy/installation.md diff --git a/docs/0install/setup.md b/docs/0install/setup.md new file mode 100644 index 00000000..eab39283 --- /dev/null +++ b/docs/0install/setup.md @@ -0,0 +1,17 @@ +## Prerequisites + +Install [0install](http://0install.net/injector.html) on your machine. + +#### OpenJDK (Linux OS) + +See [OpenJDK guide](http://openjdk.java.net/install/) for more information. + +#### Oracle Java JRE (Windows) + +See [Oracle Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) for more information. + +#### Homebrew JRE (Mac OS) + +- Install homebrew +- Install cask `brew install caskroom/cask/brew-cask` +- `brew cask install java` \ No newline at end of file diff --git a/docs/installation.md b/docs/installation.md index 090d6f93..23048f65 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -11,9 +11,46 @@ sudo yum install zanata-client *Note:* If you are not running the latest version of Fedora, the latest version of the client may not be available, so you might want to try the Ivy version (below). -## Installation with Ivy +## Installation with Ivy (Recommended) + +The Ivy distribution of the client is a small script that will download the client the first time it is run. This distribution requires Apache Ivy to run. + +1. See [Setup Ivy](/ivy/setup) for Apache Ivy installation. +2. Save [this script](https://raw.github.com/zanata/zanata-client-ivy/master/zanata-cli) somewhere on your path, and make sure it is executable. For example, assuming you have `~/bin in $PATH`, + +``` +cd ~/bin +wget https://raw.github.com/zanata/zanata-client-ivy/master/zanata-cli +chmod 755 zanata-cli +``` + +*Note:* It's a good idea to check for a new version of zanata-cli once in a while (especially when a new version of Zanata server is released). + + +## Installation with 0install + +The 0install distribution of the client is to allow zanata-cli to be available on multiple platform. This distribution requires [0install](http://0install.net/) to run. + +1. See [Setup 0install](/0install/setup) for 0install installation. +2. To run `zanata-cli`: +``` +0launch http://zanata.org/files/0install/zanata-cli.xml {command} +``` + +To install `zanata-cli` as an alias in your machine run: +``` +0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +``` +Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. + +#### Update 0install Zanata-CLI + +To update Zanata CLI, run + +``` +0install update http://zanata.org/files/0install/zanata-cli.xml +``` -See [Ivy installation](/ivy/installation) for more information. ## Manual Installation diff --git a/docs/ivy/installation.md b/docs/ivy/installation.md deleted file mode 100644 index 2f12850a..00000000 --- a/docs/ivy/installation.md +++ /dev/null @@ -1,12 +0,0 @@ -The Ivy distribution of the client is a small script that will download the client the first time it is run. This distribution requires Apache Ivy to run. - -1. See [Setup Ivy](/ivy/setup) for Apache Ivy installation. -2. Save [this script](https://raw.github.com/zanata/zanata-client-ivy/master/zanata-cli) somewhere on your path, and make sure it is executable. For example, assuming you have `~/bin in $PATH`, - -``` -cd ~/bin -wget https://raw.github.com/zanata/zanata-client-ivy/master/zanata-cli -chmod 755 zanata-cli -``` - -*Note:* It's a good idea to check for a new version of zanata-cli once in a while (especially when a new version of Zanata server is released). diff --git a/mkdocs.yml b/mkdocs.yml index a1ed7a56..f20bc070 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -11,9 +11,8 @@ pages: - Installation: 'installation.md' - Configuration: 'configuration.md' - Command Hook: 'command-hook.md' -- Ivy: - - Installation: 'ivy/installation.md' - - Setup: 'ivy/setup.md' +- Ivy setup: 'ivy/setup.md' +- 0install setup: '0install/setup.md' - Maven Plugin: - Installation: 'maven-plugin/installation.md' - Configuration: 'maven-plugin/configuration.md' From 8b3ff9b2bc68ba17624bb45fbbdef8b04462e3a5 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Thu, 25 Jun 2015 14:05:39 +1000 Subject: [PATCH 09/22] update docs --- docs/configuration.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 154de1f5..cbe71104 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -72,13 +72,13 @@ For instance, if one of your files is called `myfile/es.po` and your project in ### Translation files mapping rules You can also customize the way translation files are found when pushing, as well as the location they will be saved to when pulling. -{% highlight xml %} +```xml {locale}/{path}/{filename}.po {path}/{locale_with_underscore}.po -{% endhighlight %} +``` In the example above, `pattern` identifies a source file, and the contents of the `rule` element specify how translation files will be stored. @@ -112,22 +112,22 @@ For example, if you have the following file structure (where `{projectRoot}` is Here we have two source documents (with "pot" extension) and two translation documents (with "po" extension) for the locale "de-DE". You can then use below configuration: -{% highlight xml %} +```xml templates . {locale}/{path}/{filename}.po -{% endhighlight %} +``` Explanation: Since you have defined `` as `templates`, the source document `templates/messages/kdeedu/kalzium.pot` will have its path extracted relative to `{projectRoot}/templates`, which gives the relative path `messages/kdeedu/kalzium.pot`. The relative path then will be partitioned into several tokens to form the following variables: ``` -{path} = 'messages/kdeedu/' -{filename} = 'kalzium' -{locale} = 'de-DE' -{locale_with_underscore} = 'de_DE' -{extension} = 'pot' +{path} = 'messages/kdeedu/' +{filename} = 'kalzium' +{locale} = 'de-DE' +{locale_with_underscore} = 'de_DE' +{extension} = 'pot' ``` > **NOTE** the relative path `messages/kdeedu/kalzium.pot` will be the document's unique identifier inside Zanata. From 492c884a960331e07252ffc90a738cf8471e2359 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Fri, 24 Jul 2015 15:50:05 +1000 Subject: [PATCH 10/22] docs(installation): Update documentation for each platform: https://bugzilla.redhat.com/show_bug.cgi?id=1245431 --- docs/0install/setup.md | 17 ------------- docs/index.md | 6 ++++- docs/{ => installation}/installation.md | 2 ++ docs/installation/linux-installation.md | 24 ++++++++++++++++++ docs/installation/manual-installation.md | 19 ++++++++++++++ docs/installation/osx-installation.md | 24 ++++++++++++++++++ docs/installation/windows-installation.md | 30 +++++++++++++++++++++++ mkdocs.yml | 15 ++++++------ 8 files changed, 112 insertions(+), 25 deletions(-) delete mode 100644 docs/0install/setup.md rename docs/{ => installation}/installation.md (99%) create mode 100644 docs/installation/linux-installation.md create mode 100644 docs/installation/manual-installation.md create mode 100644 docs/installation/osx-installation.md create mode 100644 docs/installation/windows-installation.md diff --git a/docs/0install/setup.md b/docs/0install/setup.md deleted file mode 100644 index eab39283..00000000 --- a/docs/0install/setup.md +++ /dev/null @@ -1,17 +0,0 @@ -## Prerequisites - -Install [0install](http://0install.net/injector.html) on your machine. - -#### OpenJDK (Linux OS) - -See [OpenJDK guide](http://openjdk.java.net/install/) for more information. - -#### Oracle Java JRE (Windows) - -See [Oracle Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) for more information. - -#### Homebrew JRE (Mac OS) - -- Install homebrew -- Install cask `brew install caskroom/cask/brew-cask` -- `brew cask install java` \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 1d437ce4..7aa1d366 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,7 +19,11 @@ Features Installation ------------ -For installation instructions please see the [Installation Section](installation) +For installation instructions, see: + +- [Linux Installation](installation/linux-installation) +- [OS X Installation](installation/osx-installation) +- [Windows Installation](installation/windows-installation) Contribute ---------- diff --git a/docs/installation.md b/docs/installation/installation.md similarity index 99% rename from docs/installation.md rename to docs/installation/installation.md index 23048f65..e82e1090 100644 --- a/docs/installation.md +++ b/docs/installation/installation.md @@ -1,3 +1,5 @@ +# Deprecated + The Zanata client (zanata-cli) can be installed on most systems. Installation is easiest under Fedora, other systems can use Apache Ivy for installation. Manual installation is also possible. diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md new file mode 100644 index 00000000..a543b839 --- /dev/null +++ b/docs/installation/linux-installation.md @@ -0,0 +1,24 @@ +1. Install 0Install from [0Install for Linux](http://0install.net/install-linux.html) +2. Install Java JRE (1.7 onwards) + - for OpenJDK Java, see [OpenJDK installation](http://openjdk.java.net/install/index.html) + - for Oracle Java, see [Oracle Java installation](http://www.oracle.com/technetwork/java/javase/downloads/index.html) + +### Run Zanata-CLI + +``` +0launch http://zanata.org/files/0install/zanata-cli.xml {command} +``` + +### Setup alias + +To setup `zanata-cli` as an alias in your machine run: +``` +0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +``` +Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. + +### Update Zanata-CLI + +``` +0install update http://zanata.org/files/0install/zanata-cli.xml +``` diff --git a/docs/installation/manual-installation.md b/docs/installation/manual-installation.md new file mode 100644 index 00000000..8ef82021 --- /dev/null +++ b/docs/installation/manual-installation.md @@ -0,0 +1,19 @@ +If you want to setup zanata-cli from manually (without 0install): + + 1. Navigate to [zanata-cli on Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.zanata%22%20AND%20a%3A%22zanata-cli%22). + 1. Download either `dist.zip` or `dist.tar.gz`. + 1. Extract the contents of the archive to your location of choice. + 1. Create a symbolic link to the `zanata-cli` script in the bin directory of the extracted archive. e.g. from the archive directory, run `sudo ln -s bin/zanata-cli /usr/local/bin/zanata-cli`. + 1. (optional) you can also enable tab-autocomplete for the client if you use bash as your terminal shell. This can be done by copying or linking the `zanata-cli-completion` script from the bin directory to `/etc/bash_completion.d/`. e.g. `ln -s bin/zanata-cli-completion /etc/bash_completion.d/zanata-cli-completion`. + + +### Nightly Builds + +If you like to live dangerously, the client nightly relase is available. This may have newer features, but is not guaranteed to be stable. + +The latest nightly build is available as an archive that can be installed manually. To install the latest nightly build: + +1. Open [Client nightly builds](http://repository-zanata.forge.cloudbees.com/snapshot/org/zanata/zanata-cli/). +1. Open the directory showing the highest version number. +1. Download either of the distributable archives (ending with `-dist.zip` or `-dist.tar.gz`). +1. Install as per manual installation instructions above. \ No newline at end of file diff --git a/docs/installation/osx-installation.md b/docs/installation/osx-installation.md new file mode 100644 index 00000000..d31ef731 --- /dev/null +++ b/docs/installation/osx-installation.md @@ -0,0 +1,24 @@ +1. Install 0Install from [0Install for OS X](http://0install.net/install-osx.html). +2. Install Java package + - Install homebrew + - Install cask `brew install caskroom/cask/brew-cask` + - `brew cask install java` + +### Run Zanata-CLI +``` +0launch http://zanata.org/files/0install/zanata-cli.xml {command} +``` + +### Setup alias + +To setup `zanata-cli` as an alias in your machine run: +``` +0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +``` +Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. + +### Update Zanata-CLI + +``` +0install update http://zanata.org/files/0install/zanata-cli.xml +``` \ No newline at end of file diff --git a/docs/installation/windows-installation.md b/docs/installation/windows-installation.md new file mode 100644 index 00000000..c59ac5d3 --- /dev/null +++ b/docs/installation/windows-installation.md @@ -0,0 +1,30 @@ +1. Install 0Install from [0Install for Windows](http://0install.net/install-windows.html). + +### Run Zanata-CLI + +``` +0launch http://zanata.org/files/0install/zanata-cli-jre.xml {command} +``` + +If you already have Java 1.7 onwards installed, +``` +0launch http://zanata.org/files/0install/zanata-cli.xml {command} +``` + +### Setup alias + +To setup `zanata-cli` as an alias in your machine run: +``` +0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +``` +Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. + +### Update Zanata-CLI + +``` +0install update http://zanata.org/files/0install/zanata-cli.xml +``` + +### Install Java manually + +Download and install Java (JRE) package from [Oracle Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html). \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index f20bc070..5e34f42e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,16 +8,17 @@ theme: readthedocs pages: - Home: 'index.md' - User Guide: - - Installation: 'installation.md' + - Linux Installation: 'installation/linux-installation.md' + - OS X Installation: 'installation/osx-installation.md' + - Windows Installation: 'installation/windows-installation.md' + - Manual Installation: 'installation/manual-installation.md' - Configuration: 'configuration.md' - Command Hook: 'command-hook.md' -- Ivy setup: 'ivy/setup.md' -- 0install setup: '0install/setup.md' -- Maven Plugin: - - Installation: 'maven-plugin/installation.md' - - Configuration: 'maven-plugin/configuration.md' - - Commands: 'maven-plugin/commands.md' - Commands: - init: 'commands/init.md' - push: 'commands/push.md' - pull: 'commands/pull.md' +- Maven Plugin: + - Installation: 'maven-plugin/installation.md' + - Configuration: 'maven-plugin/configuration.md' + - Commands: 'maven-plugin/commands.md' From 113d21276f5bbb3f9fff27b8b04197447cc05453 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 6 Aug 2015 10:51:19 +1000 Subject: [PATCH 11/22] doc(0install):Update guide for 0install --- docs/installation/linux-installation.md | 61 ++++++++++++++++++----- docs/installation/osx-installation.md | 27 +++++----- docs/installation/windows-installation.md | 29 ++++------- 3 files changed, 72 insertions(+), 45 deletions(-) diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md index a543b839..011472ad 100644 --- a/docs/installation/linux-installation.md +++ b/docs/installation/linux-installation.md @@ -1,24 +1,61 @@ -1. Install 0Install from [0Install for Linux](http://0install.net/install-linux.html) -2. Install Java JRE (1.7 onwards) - - for OpenJDK Java, see [OpenJDK installation](http://openjdk.java.net/install/index.html) - - for Oracle Java, see [Oracle Java installation](http://www.oracle.com/technetwork/java/javase/downloads/index.html) +## RHEL/Fedora -### Run Zanata-CLI +Install EPEL repository for RHEL 6 +``` +## RHEL/CentOS 6 32-Bit ## +wget http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm +rpm -ivh epel-release-6-8.noarch.rpm +## RHEL/CentOS 6 64-Bit ## +wget http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm +rpm -ivh epel-release-6-8.noarch.rpm ``` -0launch http://zanata.org/files/0install/zanata-cli.xml {command} + +Install EPEL repository for RHEL 7 ``` +## RHEL/CentOS 7 64-Bit ## +wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm +rpm -ivh epel-release-7-5.noarch.rpm +``` + +1. To install 0Install, + - RHEL: `yum install zeroinstall-injector` + - Fedora: `yum install 0install` +2. Install Java runtime: `yum install java-1.7.0-openjdk`. +3. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`. +4. Now you can run `zanata-cli --help` for more options. + +*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* + + +## Debian based distro + +1. Install 0Install: `apt-get install zeroinstall-injector`. +2. Install Java runtime: `apt-get install openjdk-7-jre`. +3. Run `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml` to setup alias. +4. Now you can run `zanata-cli --help` for more options. -### Setup alias +*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* -To setup `zanata-cli` as an alias in your machine run: + +## Others + +1. Follow 0Install in [0Install for Linux](http://0install.net/install-linux.html). +2. Install Java JRE (1.7 onwards) from [OpenJDK installation](http://openjdk.java.net/install/index.html) +3. Run `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml` to setup alias. +4. Now you can run `zanata-cli --help` for more options. + +*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* + + +### Useful command + +**Run Zanata-CLI without alias** ``` -0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +0launch http://zanata.org/files/0install/zanata-cli.xml {command} ``` -Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. - -### Update Zanata-CLI +**Update Zanata-CLI manually** ``` 0install update http://zanata.org/files/0install/zanata-cli.xml ``` diff --git a/docs/installation/osx-installation.md b/docs/installation/osx-installation.md index d31ef731..e924dec8 100644 --- a/docs/installation/osx-installation.md +++ b/docs/installation/osx-installation.md @@ -1,24 +1,21 @@ -1. Install 0Install from [0Install for OS X](http://0install.net/install-osx.html). -2. Install Java package - - Install homebrew - - Install cask `brew install caskroom/cask/brew-cask` - - `brew cask install java` +1. Click [here](http://downloads.sourceforge.net/project/zero-install/0install/2.8/ZeroInstall.pkg) to download binary package of [0Install for OS X](http://0install.net/install-osx.html). +2. Install 0Install: `sudo installer -pkg ZeroInstall.pkg -target`. +3. Install homebrew: `ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"` +4. Install cask: `brew install caskroom/cask/brew-cask`. +5. Install Java runtime: `brew cask install java`. +6. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`. +7. Now you can run `zanata-cli --help` for more options. -### Run Zanata-CLI -``` -0launch http://zanata.org/files/0install/zanata-cli.xml {command} -``` +*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* -### Setup alias +### Useful command -To setup `zanata-cli` as an alias in your machine run: +**Run Zanata-CLI without alias** ``` -0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +0launch http://zanata.org/files/0install/zanata-cli.xml {command} ``` -Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. - -### Update Zanata-CLI +**Update Zanata-CLI manually** ``` 0install update http://zanata.org/files/0install/zanata-cli.xml ``` \ No newline at end of file diff --git a/docs/installation/windows-installation.md b/docs/installation/windows-installation.md index c59ac5d3..be930fd6 100644 --- a/docs/installation/windows-installation.md +++ b/docs/installation/windows-installation.md @@ -1,30 +1,23 @@ -1. Install 0Install from [0Install for Windows](http://0install.net/install-windows.html). +1. Click [here](http://0install.de/files/zero-install.exe) to download and install [0Install for Windows](http://0install.net/install-windows.html). +2. Run `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli-jre.xml` to setup alias. +3. Now you can run `zanata-cli --help` for more options. -### Run Zanata-CLI +*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* -``` -0launch http://zanata.org/files/0install/zanata-cli-jre.xml {command} -``` -If you already have Java 1.7 onwards installed, -``` -0launch http://zanata.org/files/0install/zanata-cli.xml {command} -``` -### Setup alias +### Useful command -To setup `zanata-cli` as an alias in your machine run: +**Run Zanata-cli without alias** ``` -0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml +0launch http://zanata.org/files/0install/zanata-cli-jre.xml {command} ``` -Now you can run `zanata-cli --help` for more options. If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work. - -### Update Zanata-CLI +**Update Zanata-cli manually** ``` -0install update http://zanata.org/files/0install/zanata-cli.xml +0install update http://zanata.org/files/0install/zanata-cli-jre.xml ``` -### Install Java manually +**Zanata-cli feed without JRE dependency** -Download and install Java (JRE) package from [Oracle Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html). \ No newline at end of file +`http://zanata.org/files/0install/zanata-cli.xml` \ No newline at end of file From ddeb5dc0d316324a0fb16a45e94759ba9291b1f4 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 11:39:54 +1000 Subject: [PATCH 12/22] chore(dependency): update dependency to latest --- zanata-maven-plugin/demo-xliff/pom.xml | 2 +- zanata-maven-plugin/sample-scripts/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zanata-maven-plugin/demo-xliff/pom.xml b/zanata-maven-plugin/demo-xliff/pom.xml index 59c3aef6..2858e567 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.7.2-SNAPSHOT + 3.7.4-SNAPSHOT xliff ${zanata.srcDir} diff --git a/zanata-maven-plugin/sample-scripts/pom.xml b/zanata-maven-plugin/sample-scripts/pom.xml index 34468696..d5891754 100644 --- a/zanata-maven-plugin/sample-scripts/pom.xml +++ b/zanata-maven-plugin/sample-scripts/pom.xml @@ -9,7 +9,7 @@ org.zanata zanata-maven-plugin - 3.7.2-SNAPSHOT + 3.7.4-SNAPSHOT . From a1ce1c13fd3cdd094a36eac63e574820c586f9b6 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 12:49:24 +1000 Subject: [PATCH 13/22] Update to zanata-common-3.7.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e1ac26f..57772a67 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.7.3 - 3.7.2 + 3.7.3 3.0.1.Final 1.17.1 From 07f89faf1dd625898ea2adbc896a9fe04a8e43eb Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 13:43:34 +1000 Subject: [PATCH 14/22] [maven-release-plugin] prepare release client-3.7.4 --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 57772a67..c77e130b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.4-SNAPSHOT + 3.7.4 Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 diff --git a/stub-server/pom.xml b/stub-server/pom.xml index ac14dca3..253f98ef 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4-SNAPSHOT + 3.7.4 stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 621395e5..23bbd37e 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4-SNAPSHOT + 3.7.4 zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index d1accba9..40295d73 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4-SNAPSHOT + 3.7.4 zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index de476978..0e0527f6 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4-SNAPSHOT + 3.7.4 zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index 22598966..ed399653 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.4-SNAPSHOT + 3.7.4 jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.7.4 From f0393d2c761770cb2d3dcc4c87a1363185d14860 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 13:43:41 +1000 Subject: [PATCH 15/22] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c77e130b..c089f63d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.7.4 + 3.7.5-SNAPSHOT Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD diff --git a/stub-server/pom.xml b/stub-server/pom.xml index 253f98ef..6cdb5637 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4 + 3.7.5-SNAPSHOT stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 23bbd37e..58cabfb7 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4 + 3.7.5-SNAPSHOT zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 40295d73..012eb2b9 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4 + 3.7.5-SNAPSHOT zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index 0e0527f6..9168b43f 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.7.4 + 3.7.5-SNAPSHOT zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index ed399653..c7675fc4 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.7.4 + 3.7.5-SNAPSHOT jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.7.4 + HEAD From 43d0413e0566480fdf880c87dff168d06066de38 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 29 Oct 2015 11:48:24 +1000 Subject: [PATCH 16/22] doc(install): Update instruction for RHEL 7 --- docs/installation/linux-installation.md | 47 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md index 011472ad..865cd9ec 100644 --- a/docs/installation/linux-installation.md +++ b/docs/installation/linux-installation.md @@ -1,30 +1,43 @@ -## RHEL/Fedora +## RHEL 7 -Install EPEL repository for RHEL 6 +1. Install EPEL repository for RHEL 7 ``` -## RHEL/CentOS 6 32-Bit ## -wget http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm -rpm -ivh epel-release-6-8.noarch.rpm - -## RHEL/CentOS 6 64-Bit ## -wget http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm -rpm -ivh epel-release-6-8.noarch.rpm +sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm ``` -Install EPEL repository for RHEL 7 +2. Install 0install ``` -## RHEL/CentOS 7 64-Bit ## -wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm -rpm -ivh epel-release-7-5.noarch.rpm +sudo yum -y install 0install ``` -1. To install 0Install, - - RHEL: `yum install zeroinstall-injector` - - Fedora: `yum install 0install` -2. Install Java runtime: `yum install java-1.7.0-openjdk`. 3. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`. 4. Now you can run `zanata-cli --help` for more options. +## RHEL 6 + +1. Download binary package from [0Install v2.10 x86_64](https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-x86_64-2.10.tar.bz2) or [0Install v2.10 i486](https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-i486-2.10.tar.bz2) +2. Unpack it, and run the `install.sh` script inside. You'll need libcurl installed (most systems have it by default). +3. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`. +4. Now you can run `zanata-cli --help` for more options. + +## Fedora + +The recommend way to install is though 0install: + +1. Install 0install +``` +sudo yum -y install 0install +``` + +2. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`. +3. Now you can run `zanata-cli --help` for more options. + +You can also install using yum/dnf: + +``` +sudo yum -y install zanata-client +``` + *Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* From c89ee193078fbf3034d7de9891a6fe921025a113 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 10 Nov 2015 18:06:24 +1000 Subject: [PATCH 17/22] doc(release-notes): Add ZNTA-354 --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 08cc632a..e5149ccd 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,6 +1,7 @@ ## 3.8.0 ##### Changes +* [ZNTA-354](https://zanata.atlassian.net/browse/ZNTA-354) - Improve Zanata client installation documentation and workflow * [ZNTA-664](https://zanata.atlassian.net/browse/ZNTA-664) - Change client push command not to run copy trans by default ----------------------- From de9ed3c62c63fa2412c3ad4315450d992561043b Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 10 Nov 2015 18:08:17 +1000 Subject: [PATCH 18/22] chore(dependency): [zanata-nexus-staging] Update Zanata dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dea5bc3b..b36c8cb8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.zanata zanata-parent - 25-SNAPSHOT + 25 ../parent @@ -35,7 +35,7 @@ - 3.8.0-SNAPSHOT + 3.8.2 3.8.0-SNAPSHOT 3.0.11.Final 1.17.1 From 4a3e2c4d6adf457ad6a98387dba521666fb21b71 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 10 Nov 2015 18:14:53 +1000 Subject: [PATCH 19/22] doc(javadoc): disable doclint --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index b36c8cb8..f1676d55 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,13 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + org.codehaus.mojo findbugs-maven-plugin From 6f0965a249e41817e764019df720a446f07943c3 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 11 Nov 2015 09:02:27 +1000 Subject: [PATCH 20/22] chore(dependency): [zanata-nexus-staging] Update Zanata dependencies --- pom.xml | 4 ++-- stub-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f1676d55..c95136a2 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,8 @@ 3.8.2 - 3.8.0-SNAPSHOT - 3.0.11.Final + 3.8.0 + 3.0.12.Final 1.17.1 diff --git a/stub-server/pom.xml b/stub-server/pom.xml index 68eecc01..9147d953 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -19,7 +19,7 @@ UTF-8 - 9.0.3.v20130506 + 9.3.5.v20151012 From b4c4ee982f3ebf6e34c3c6c31b41c56e5008eec1 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 11 Nov 2015 09:56:18 +1000 Subject: [PATCH 21/22] [maven-release-plugin] prepare release client-3.8.0 --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c95136a2..f68e0543 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.8.0-SNAPSHOT + 3.8.0 Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 diff --git a/stub-server/pom.xml b/stub-server/pom.xml index 9147d953..d353e08c 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0-SNAPSHOT + 3.8.0 stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 838afb49..45e2c510 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0-SNAPSHOT + 3.8.0 zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 5217f164..81a8731b 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0-SNAPSHOT + 3.8.0 zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index 0548ddd1..5859a60d 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0-SNAPSHOT + 3.8.0 zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index 51c47b5e..0ba65eb8 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.8.0-SNAPSHOT + 3.8.0 jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - HEAD + client-3.8.0 From afb49722cde15b844ce77fe21c262479b796e3ae Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 11 Nov 2015 09:56:25 +1000 Subject: [PATCH 22/22] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- stub-server/pom.xml | 4 ++-- zanata-cli/pom.xml | 4 ++-- zanata-client-commands/pom.xml | 4 ++-- zanata-maven-plugin/pom.xml | 4 ++-- zanata-rest-client/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f68e0543..6d13a249 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 client - 3.8.0 + 3.8.1-SNAPSHOT Zanata client modules pom @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD diff --git a/stub-server/pom.xml b/stub-server/pom.xml index d353e08c..57dbf94c 100644 --- a/stub-server/pom.xml +++ b/stub-server/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0 + 3.8.1-SNAPSHOT stub-server stub-server @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml index 45e2c510..6efee5e7 100644 --- a/zanata-cli/pom.xml +++ b/zanata-cli/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0 + 3.8.1-SNAPSHOT zanata-cli Zanata command-line client @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml index 81a8731b..b6691ee2 100644 --- a/zanata-client-commands/pom.xml +++ b/zanata-client-commands/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0 + 3.8.1-SNAPSHOT zanata-client-commands Zanata client commands @@ -14,7 +14,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml index 5859a60d..4a8cfbbb 100644 --- a/zanata-maven-plugin/pom.xml +++ b/zanata-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.zanata client - 3.8.0 + 3.8.1-SNAPSHOT zanata-maven-plugin @@ -27,7 +27,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml index 0ba65eb8..c4634f98 100644 --- a/zanata-rest-client/pom.xml +++ b/zanata-rest-client/pom.xml @@ -6,7 +6,7 @@ org.zanata client - 3.8.0 + 3.8.1-SNAPSHOT jar @@ -16,7 +16,7 @@ scm:git:git://github.com/zanata/zanata-client.git scm:git:git@github.com:zanata/zanata-client.git https://github.com/zanata/zanata-client - client-3.8.0 + HEAD