Merge remote-tracking branch 'origin/release' into integration/master

zanata · Nov 12, 2015 · d8a0855 · d8a0855
2 parents f15d601 + afb4972
commit d8a0855
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 8 deletions.
diff --git 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
 
 -----------------------

diff --git a/pom.xml b/pom.xml
@@ -43,6 +43,13 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>-Xdoclint:none</additionalparam>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>

diff --git a/stub-server/pom.xml b/stub-server/pom.xml
@@ -19,7 +19,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>9.0.3.v20130506</jetty.version>
+    <jetty.version>9.3.5.v20151012</jetty.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/zanata-maven-plugin/demo-glossary/compendium/pom.xml b/zanata-maven-plugin/demo-glossary/compendium/pom.xml
@@ -9,7 +9,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <configuration>
           <glossaryFile>fr.po</glossaryFile>
           <transLang>pl</transLang>

diff --git a/zanata-maven-plugin/demo-glossary/csv/pom.xml b/zanata-maven-plugin/demo-glossary/csv/pom.xml
@@ -9,7 +9,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <configuration>
           <glossaryFile>translate1.csv</glossaryFile>
         </configuration>

diff --git a/zanata-maven-plugin/demo-glossary/delete/pom.xml b/zanata-maven-plugin/demo-glossary/delete/pom.xml
@@ -9,7 +9,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <configuration>
           <lang>zh</lang>
           <allGlossary>true</allGlossary>

diff --git a/zanata-maven-plugin/demo-glossary/fuel/pom.xml b/zanata-maven-plugin/demo-glossary/fuel/pom.xml
@@ -9,7 +9,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <configuration>
           <glossaryFile>fuel_hi.po</glossaryFile>
           <transLang>hi</transLang>

diff --git a/zanata-maven-plugin/demo-publican/pom.xml b/zanata-maven-plugin/demo-publican/pom.xml
@@ -14,7 +14,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <configuration>
           <srcDir>${zanata.srcDir}</srcDir>
           <transDir>${zanata.transDir}</transDir>

diff --git a/zanata-maven-plugin/demo-xliff/pom.xml b/zanata-maven-plugin/demo-xliff/pom.xml
@@ -14,7 +14,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <configuration>
           <projectType>xliff</projectType>
           <srcDir>${zanata.srcDir}</srcDir>

diff --git a/zanata-maven-plugin/sample-scripts/pom.xml b/zanata-maven-plugin/sample-scripts/pom.xml
@@ -9,7 +9,7 @@
       <plugin>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-maven-plugin</artifactId>
-        <version>1.4.4</version>
+        <version>3.7.4-SNAPSHOT</version>
         <configuration>
           <srcDir>.</srcDir>
         </configuration>