[zanata-client] Upstream update to 3.4.1
Ding-Yi Chen
dchen at fedoraproject.org
Mon Feb 2 06:43:43 UTC 2015
commit 2fab54a549e541cf3aa58b469e74f89713f8ef74
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: Mon Feb 2 16:43:03 2015 +1000
Upstream update to 3.4.1
zanata-client.spec | 80 ++++++++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 36 deletions(-)
---
diff --git a/zanata-client.spec b/zanata-client.spec
index 004ae03..537d214 100644
--- a/zanata-client.spec
+++ b/zanata-client.spec
@@ -3,10 +3,11 @@
%global submodule_rest zanata-rest-%{shortname}
%global submodule_commands zanata-%{shortname}-commands
%global submodule_cli zanata-cli
+%global java_version 1.7
Name: zanata-%{shortname}
-Version: 3.3.2
-Release: 3%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
Summary: Zanata client module
Group: Development/Tools
@@ -25,7 +26,6 @@ BuildRequires: maven-dependency-plugin
BuildRequires: powermock-junit4
BuildRequires: powermock-api-mockito
BuildRequires: powermock-core
-BuildRequires: mvn(org.simpleframework:simple)
BuildRequires: zanata-parent
BuildRequires: zanata-api >= 3.3.1
BuildRequires: xom
@@ -34,8 +34,14 @@ BuildRequires: args4j >= 2.0.25
BuildRequires: opencsv
BuildRequires: openprops
BuildRequires: jgettext
-BuildRequires: mvn(net.sourceforge.findbugs:annotations)
-
+BuildRequires: mvn(com.sun:tools)
+BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires: java-devel >= 1:%{java_version}
+
+Requires: java-headless >= 1:%{java_version}
Requires: resteasy >= 3.0.1
Requires: mvn(org.apache.commons:commons-exec)
Requires: zanata-api
@@ -60,7 +66,7 @@ Requires: %{name} = %{version}-%{release}
%description javadoc
This package contains the API documentation for %{shortname}.
-This includes submodules:
+This includes sub modules:
%{submodule_rest}, %{submodule_commands} and %{submodule_cli}.
%prep
@@ -68,52 +74,51 @@ 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_plugin :findbugs-maven-plugin
+%pom_remove_dep org.simpleframework:simple
+%pom_remove_dep org.simpleframework:simple %{submodule_commands}
+%pom_remove_dep org.simpleframework:simple %{submodule_cli}
+%pom_remove_dep org.powermock:powermock-module-junit4 %{submodule_cli}
+%pom_xpath_inject "pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions" "<exclusion><groupId>com.sun</groupId><artifactId>tools</artifactId></exclusion>" %{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}
+# Ensure it compile with supported java version
+%pom_xpath_inject "pom:plugins" "<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{java_version}</source><target>%{java_version}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>"
# 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
-
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/UpdateCheckerTest.java
+
+# Fedora does not have powermock-1.6.1 yet
+rm %{submodule_cli}/src/test/java/org/zanata/client/ZanataClientTest.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/*.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/init/*.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/push/*.java
+rm %{submodule_commands}/src/test/java/org/zanata/client/commands/pull/*.java
%build
# -Dmaven.local.debug=true
-%mvn_build -- -Dmdep.analyze.skip=true -e
-
-# local offline maven can not resolve each module,
-# we have to disable our own module and generate classpath one by one
-cd %{submodule_rest}
-mvn-rpmbuild dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile=target/%{submodule_rest}-classpath.txt
-
-cd ..
-%pom_remove_dep org.zanata:%{submodule_rest} %{submodule_commands}
-cd %{submodule_commands}
-mvn-rpmbuild dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile=target/%{submodule_commands}-classpath.txt
-
-cd ..
-%pom_remove_dep org.zanata:%{submodule_commands} %{submodule_cli}
-cd %{submodule_cli}
-mvn-rpmbuild dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile=target/%{submodule_cli}-classpath.txt
-
+%mvn_build -X -G -- -Dmdep.analyze.skip=true -DfailIfNoTests=false -DskipTests=true dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile=%{name}-classpath.txt
%install
%mvn_install
-rest_cp=$(cat %{submodule_rest}/target/%{submodule_rest}-classpath.txt)
-commands_cp=$(cat %{submodule_commands}/target/%{submodule_commands}-classpath.txt)
-cli_cp=$(cat %{submodule_cli}/target/%{submodule_cli}-classpath.txt)
+rest_cp=$(cat %{submodule_rest}/%{name}-classpath.txt)
+commands_cp=$(cat %{submodule_commands}/%{name}-classpath.txt)
+cli_cp=$(cat %{submodule_cli}/%{name}-classpath.txt)
+all_cp=$rest_cp:$commands_cp:$cli_cp
-%global CLASSPATH $rest_cp:$commands_cp:$cli_cp
+%global CLASSPATH $all_cp
mkdir -p %{buildroot}%{_bindir}
install -d -m 755 %{buildroot}%{_bindir}
+
+rm %{buildroot}%{_javadocdir}/%{name}/javadoc.sh
+
# create wrapper script
# adapted from jpackage_script().
# We build CLASSPATH at build time and the script won't be able to access it at runtime
@@ -121,7 +126,7 @@ install -d -m 755 %{buildroot}%{_bindir}
cat > %{buildroot}%{_bindir}/zanata-cli << ZANATA_CLI
#!/bin/sh
#
-# %{name} script
+# {name} script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
@@ -163,6 +168,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
%files javadoc -f .mfiles-javadoc
%changelog
+* Mon Feb 02 2015 Ding-Yi Chen <dchen at redhat.com> 3.4.1-1
+- Upstream update to 3.4.1
+
* Mon Jul 28 2014 Patrick Huang <pahuang at redhat.com> 3.3.2-3
- Add version restriction and fix exec script classpath
More information about the scm-commits
mailing list