[zanata-client/f20] upgrade to latest upstream

[Patrick Huang]

commit f4d39fbc53d5aaeb19e53ca02b809255f2e86b6b
Author: Patrick Huang <pahuang at redhat.com>
Date:   Sun Jun 1 21:42:59 2014 -0400

    upgrade to latest upstream

 .gitignore                          |    1 +
 slf4j-backward-compatible-fix.patch |   13 -----
 sources                             |    2 +-
 zanata-client.spec                  |   84 +++++++++++++++-------------------
 4 files changed, 39 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3db47a0..2920995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /client-3.1.0.zip
 /client-3.1.1.zip
 /client-3.1.2.zip
+/client-3.3.0.zip
diff --git a/sources b/sources
index 7e31106..4c5c502 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60250a7b656a059d9f5c627733f37480  client-3.1.2.zip
+810f65eee5bc439b34625a4854327dca  client-3.3.0.zip
diff --git a/zanata-client.spec b/zanata-client.spec
index 1de3b61..93fb4a5 100644
--- a/zanata-client.spec
+++ b/zanata-client.spec
@@ -5,7 +5,7 @@
 %global submodule_cli zanata-cli
 
 Name:           zanata-%{shortname}
-Version:        3.1.2
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        Zanata client module
 
@@ -13,64 +13,38 @@ Group:          Development/Tools
 License:        LGPLv2+
 URL:            https://github.com/zanata/%{name}
 Source0:        https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip
-Patch0:         slf4j-backward-compatible-fix.patch
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-
+BuildRequires:  resteasy >= 3.0.1
+BuildRequires:  mvn(org.mockito:mockito-core)
+BuildRequires:  mvn(org.apache.commons:commons-exec)
+BuildRequires:  exec-maven-plugin
 BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-testng
-BuildRequires:  maven-surefire-provider-junit4
-
-# dependencies in zanata-rest-client
+BuildRequires:  powermock-junit4
+BuildRequires:  powermock-api-mockito
+BuildRequires:  powermock-core
+BuildRequires:  mvn(org.simpleframework:simple)
 BuildRequires:  zanata-parent
 BuildRequires:  zanata-api
-BuildRequires:  junit
-BuildRequires:  resteasy
-
-# dependencies in zanata-common-commands
+BuildRequires:  xom
 BuildRequires:  zanata-common
-BuildRequires:  mockito
-BuildRequires:  apache-commons-configuration
-BuildRequires:  log4j
 BuildRequires:  args4j >= 2.0.25
-BuildRequires:  openprops
-BuildRequires:  apache-commons-collections
-BuildRequires:  guava
-BuildRequires:  hamcrest
-BuildRequires:  apache-commons-lang
-BuildRequires:  apache-commons-codec
-BuildRequires:  apache-commons-io
 BuildRequires:  opencsv
-BuildRequires:  ant
-
-# dependencies in zanata-cli
-BuildRequires:  exec-maven-plugin 
-BuildRequires:  powermock-junit4
-BuildRequires:  powermock-api-mockito
-BuildRequires:  powermock-core
-
-Requires:       jpackage-utils
-Requires:       java
+BuildRequires:  openprops
+BuildRequires:  jgettext
+BuildRequires:  mvn(net.sourceforge.findbugs:annotations)
 
-Requires:       slf4j
+Requires:       resteasy >= 3.0.1
+Requires:       mvn(org.apache.commons:commons-exec)
 Requires:       zanata-api
-Requires:       resteasy
 Requires:       zanata-common
-Requires:       apache-commons-configuration
-Requires:       log4j
-Requires:       args4j
-Requires:       openprops
-Requires:       apache-commons-collections
-Requires:       guava
-Requires:       apache-commons-lang
-Requires:       apache-commons-codec
-Requires:       apache-commons-io
+Requires:       args4j >= 2.0.25
 Requires:       opencsv
-Requires:       ant
+Requires:       openprops
+Requires:       jgettext
+Requires:       xom
 
 
 %description
@@ -94,6 +68,19 @@ This includes submodules:
 %pom_disable_module zanata-maven-plugin 
 %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli}
 %pom_remove_plugin :maven-assembly-plugin %{submodule_cli}
+# here we replace google findbugs annotations with sourceforge one
+%pom_remove_dep com.google.code.findbugs:annotations %{submodule_cli}
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>net.sourceforge.findbugs</groupId><artifactId>annotations</artifactId><version>2.0.2</version></dependency>" %{submodule_cli}
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version></dependency>" %{submodule_cli}
+
+%pom_remove_dep com.google.code.findbugs:annotations %{submodule_commands}
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>net.sourceforge.findbugs</groupId><artifactId>annotations</artifactId><version>2.0.2</version></dependency>" %{submodule_commands}
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version></dependency>" %{submodule_commands}
+
+# simpleframework in fedora is too old
+rm %{submodule_cli}/src/test/java/org/zanata/client/HTTPMockContainer.java
+rm %{submodule_cli}/src/test/java/org/zanata/client/ClientToServerTest.java
+
 
 %build
 # -Dmaven.local.debug=true
@@ -176,8 +163,11 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
 %files javadoc -f .mfiles-javadoc
 
 %changelog
-* Wed Sep 4 2013 Patrick Huang <pahuang at redhat.com> 3.1.2-1
-- Upstream update 
+* Mon Jun 02 2014 Patrick Huang <pahuang at redhat.com> 3.3.2-1
+- Latest upstream version
+
+* Thu Jan 09 2014 Patrick Huang <pahuang at redhat.com> 3.3.0-1
+- Latest upstream version
 
 * Wed Aug 28 2013 Patrick Huang <pahuang at redhat.com> 3.1.1-1
 - Upstream update for newer version of RESTEasy