[zanata-api/f19] update to upstream version 3.3.1

[Patrick Huang]

commit 0b4ab4f6b6d79e7e03d3f615d85a26efb5efa588
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Jul 21 21:14:06 2014 -0400

    update to upstream version 3.3.1

 api-3.3.1.zip   |  Bin 0 -> 172732 bytes
 zanata-api.spec |  102 +++++++++++++++++++++---------------------------------
 2 files changed, 40 insertions(+), 62 deletions(-)
---
diff --git a/api-3.3.1.zip b/api-3.3.1.zip
new file mode 100644
index 0000000..f332fb0
Binary files /dev/null and b/api-3.3.1.zip differ
diff --git a/zanata-api.spec b/zanata-api.spec
index 6944ef4..7df12a5 100644
--- a/zanata-api.spec
+++ b/zanata-api.spec
@@ -2,49 +2,24 @@
 %global submodule zanata-common-%{shortname}
 
 Name:           zanata-%{shortname}
-Version:        2.2.0
-Release:        7%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Zanata API modules
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            https://github.com/zanata/%{name}
 Source0:        https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip
+Patch0:         remove-enunciate.patch
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-surefire-provider-testng
-
-# dependencies in pom
 BuildRequires:  zanata-parent
-BuildRequires:  hamcrest
-BuildRequires:  testng
-
-# dependencies in zanata-common-api
+BuildRequires:  enunciate-core-annotations
+BuildRequires:  mvn(net.sourceforge.findbugs:annotations)
 BuildRequires:  hibernate-validator
-BuildRequires:  jackson
-BuildRequires:  apache-commons-lang
-BuildRequires:  apache-commons-codec
-BuildRequires:  resteasy
-%if 0%{?fedora} < 19
-BuildRequires:  apache-james-project
-%endif
-BuildRequires:  slf4j
-BuildRequires:  jboss-annotations-1.1-api
-
-
-Requires:       hibernate-validator
-Requires:       jackson
-Requires:       apache-commons-lang
-Requires:       apache-commons-codec
-Requires:       resteasy
-Requires:       slf4j
-Requires:       jboss-annotations-1.1-api
-
-Requires:       jpackage-utils
-Requires:       java
+BuildRequires:  mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec)
 
 %description
 Zanata API modules
@@ -63,53 +38,56 @@ This package contains the API documentation for %{submodule}.
 %prep
 %setup -q -n %{name}-%{shortname}-%{version}
 %pom_remove_plugin :maven-dependency-plugin %{submodule}
+%pom_remove_plugin :gmaven-plugin %{submodule}
+%pom_remove_plugin :maven-shade-plugin %{submodule}
+%pom_remove_plugin :maven-enunciate-plugin %{submodule}
+%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule}
+# here we replace google findbugs annotations with sourceforge one
+%pom_remove_dep com.google.code.findbugs:annotations %{submodule}
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>net.sourceforge.findbugs</groupId><artifactId>annotations</artifactId><version>2.0.2</version></dependency>" %{submodule}
+# delete enunciate stuff
+rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate
+rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate
+rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java
+# remove groovy-all and spock
+%pom_remove_dep org.codehaus.groovy:groovy-all %{submodule}
+%pom_remove_dep org.spockframework:spock-core %{submodule}
+%patch0
 
 %build
 
 # -Dmaven.local.debug=true
-#%mvn_build --skip-tests
-%if 0%{?fedora} > 19
-%mvn_build
-%endif
-%if 0%{?fedora} == 19
 %mvn_build --skip-tests
-%else
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
-%endif
+#%mvn_build
 
 %install
-%if 0%{?fedora} > 18
 %mvn_install
-%else
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{submodule}/target/%{submodule}*-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{submodule}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{submodule}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 %{submodule}/pom.xml  %{buildroot}%{_mavenpomdir}/JPP-%{submodule}.pom
-
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{submodule}.pom %{submodule}.jar
-%endif
 
 %files -f .mfiles
-%if 0%{?fedora} > 18
 %dir %{_javadir}/%{name}
-%endif
 %doc README.txt 
 
-%if 0%{?fedora} > 18
 %files javadoc -f .mfiles-javadoc
-%else
-%files javadoc
-%{_javadocdir}/%{submodule}
-%endif
 
 %changelog
+* Fri May 30 2014 Patrick Huang <pahuang at redhat.com> - 3.3.1-1
+- Upgrade to upstream version 3.3.1
+
+* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 3.2.0-3
+- Use Requires: java-headless rebuild (#1067528)
+
+* Fri Jan 17 2014 Patrick Huang <pahuang at redhat.com> 3.2.0-2
+- Add BR
+
+* Thu Jan 09 2014 Patrick Huang <pahuang at redhat.com> 3.2.0-1
+- Upstream update
+
+* Thu Aug 22 2013 Patrick Huang <pahuang at redhat.com> 3.0.1-1
+- Latest upstream version
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri May 3 2013 Patrick Huang <pahuang at redhat.com> 2.2.0-7
 - Remove javadoc subpackage require %{?_isa}