From 2a35f75d2be9545ee7e03eb4a825ce2c8055d31c Mon Sep 17 00:00:00 2001 From: David Mason Date: Tue, 8 Dec 2015 14:47:35 +1000 Subject: [PATCH 1/4] docs(install): add java to client yum install instructions --- docs/installation/linux-installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md index 4db9c339..5b2f7745 100644 --- a/docs/installation/linux-installation.md +++ b/docs/installation/linux-installation.md @@ -25,7 +25,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 2. Install package `zanata-cli-bin` - sudo yum -y install zanata-cli-bin + sudo yum -y install zanata-cli-bin java-1.8.0-openjdk 3. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -70,7 +70,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 2. Install package `zanata-cli-bin` - sudo yum -y install zanata-cli-bin + sudo yum -y install zanata-cli-bin java-1.8.0-openjdk 3. It should be done now. Run `zanata-cli --help` for the usage of the client. From 2b2c38febb1637ad5c7f1e83121588d424a34118 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 10 Dec 2015 14:14:51 +1000 Subject: [PATCH 2/4] docs(0install): Update 0install installation guide https://zanata.atlassian.net/browse/ZNTA-843 --- docs/installation/linux-installation.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md index 5b2f7745..f0b8ad0f 100644 --- a/docs/installation/linux-installation.md +++ b/docs/installation/linux-installation.md @@ -14,7 +14,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml + 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -59,7 +59,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 4. Use `zanata-cli` as alias: - 0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml + 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 5. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -86,7 +86,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 2. Use `zanata-cli` as alias: - 0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml + 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 3. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -108,7 +108,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml + 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -119,7 +119,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 2. Install Java JRE (1.8 onwards) from [OpenJDK installation](http://openjdk.java.net/install/index.html) 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml + 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -127,9 +127,9 @@ There are two ways to install zanata-client, via `0install` or `dnf`. * Run Zanata-CLI without alias - 0launch http://zanata.org/files/0install/zanata-cli.xml {command} + 0launch https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml {command} * Update Zanata-CLI manually - 0install update http://zanata.org/files/0install/zanata-cli.xml + 0install update https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml From 5a918cca5e10a6b8df493eea55ba02a824bd3cd1 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Fri, 11 Dec 2015 07:34:47 +1000 Subject: [PATCH 3/4] docs(installation guide):update installation guide --- docs/installation/installation.md | 79 ----------------------- docs/installation/linux-installation.md | 10 +-- docs/installation/osx-installation.md | 27 +++----- docs/installation/windows-installation.md | 8 +-- 4 files changed, 18 insertions(+), 106 deletions(-) delete mode 100644 docs/installation/installation.md diff --git a/docs/installation/installation.md b/docs/installation/installation.md deleted file mode 100644 index e82e1090..00000000 --- a/docs/installation/installation.md +++ /dev/null @@ -1,79 +0,0 @@ -# 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. - - -## Installation on Fedora - -If you are using Fedora, zanata-cli is available through the `yum` package manager. - -```bash -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 (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 -``` - - -## Manual Installation - -To manually install zanata-cli: - - 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/linux-installation.md b/docs/installation/linux-installation.md index f0b8ad0f..9a75a32a 100644 --- a/docs/installation/linux-installation.md +++ b/docs/installation/linux-installation.md @@ -14,7 +14,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml + mkdir -p ~/bin | 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -59,7 +59,7 @@ There are two ways to install zanata-client, via `0install` or `yum`. 4. Use `zanata-cli` as alias: - 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml + mkdir -p ~/bin | 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 5. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -86,7 +86,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 2. Use `zanata-cli` as alias: - 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml + mkdir -p ~/bin | 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 3. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -108,7 +108,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml + mkdir -p ~/bin | 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. @@ -119,7 +119,7 @@ There are two ways to install zanata-client, via `0install` or `dnf`. 2. Install Java JRE (1.8 onwards) from [OpenJDK installation](http://openjdk.java.net/install/index.html) 3. Use `zanata-cli` as alias: - 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml + mkdir -p ~/bin | 0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml 4. It should be done now. Run `zanata-cli --help` for the usage of the client. diff --git a/docs/installation/osx-installation.md b/docs/installation/osx-installation.md index e924dec8..03239613 100644 --- a/docs/installation/osx-installation.md +++ b/docs/installation/osx-installation.md @@ -1,21 +1,12 @@ -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. +## With Homebrew -*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.* +1. Install [Homebrew](http://brew.sh/): `ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"` + - If you already have Homebrew installed, run `brew update` to pull in the latest formulae. +2. If you **don't** have Java 1.7+, you can install it using `brew install brew-cask && brew cask install java`. +3. Install the zanata-client: `brew install zanata-client` +4. Now you can run `zanata-cli --help` for more options. -### Useful command +### Upgrading -**Run Zanata-CLI without alias** -``` -0launch http://zanata.org/files/0install/zanata-cli.xml {command} -``` - -**Update Zanata-CLI manually** -``` -0install update http://zanata.org/files/0install/zanata-cli.xml -``` \ No newline at end of file +1. Run `brew update` +2. Run `brew upgrade zanata-client` \ No newline at end of file diff --git a/docs/installation/windows-installation.md b/docs/installation/windows-installation.md index be930fd6..46e3cc6a 100644 --- a/docs/installation/windows-installation.md +++ b/docs/installation/windows-installation.md @@ -1,5 +1,5 @@ 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. +2. Run `0install -c add zanata-cli https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli-jre.xml` to setup alias. 3. 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.* @@ -10,14 +10,14 @@ **Run Zanata-cli without alias** ``` -0launch http://zanata.org/files/0install/zanata-cli-jre.xml {command} +0launch https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli-jre.xml {command} ``` **Update Zanata-cli manually** ``` -0install update http://zanata.org/files/0install/zanata-cli-jre.xml +0install update https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli-jre.xml ``` **Zanata-cli feed without JRE dependency** -`http://zanata.org/files/0install/zanata-cli.xml` \ No newline at end of file +`https://raw.githubusercontent.com/zanata/zanata.github.io/master/files/0install/zanata-cli.xml` \ No newline at end of file From 3ff582497d3c5bc32ece2f4edc1b4a6965834c53 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 14 Dec 2015 17:44:56 +1000 Subject: [PATCH 4/4] doc(release): Add release-note for 3.8.1 --- docs/release-notes.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index e5149ccd..5accaa2b 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,5 +1,14 @@ +## 3.8.1 + +##### Changes +* Add a new parameter includeAutomatedEntry to API getContributionStatics +* Downgrade dependency to keep enforcer happy + ## 3.8.0 +##### Highlight +* Copy Trans will nolonger run by default. Option `--copy-trans` is now required to invoke copy trans when pushing + ##### 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