From b19d2f154fd31ee23f9d62a7be8b2a5b4bd0f2d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:41:50 -0500 Subject: [PATCH 01/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 6fdb14a..a973a08 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -12,7 +12,7 @@ Name: zanata-%{shortname} Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata client module Group: Development/Tools @@ -231,6 +231,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %endif %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu May 16 2013 Patrick Huang 2.2.0-2 - Change license to LGPLv2+ From 1b885e898098b484c56fc3beeb5cd0cd8a595374 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 27 Aug 2013 22:55:02 -0400 Subject: [PATCH 02/38] upstream update --- zanata-client.spec | 69 +++++++--------------------------------------- 1 file changed, 10 insertions(+), 59 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index a973a08..1358218 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -1,9 +1,3 @@ -%if 0%{?fedora} > 18 - %global mvn_exec_plugin exec-maven-plugin -%else - %global mvn_exec_plugin maven-plugin-exec -%endif - %global shortname client %global submodule_rest zanata-rest-%{shortname} @@ -11,8 +5,8 @@ %global submodule_cli zanata-cli Name: zanata-%{shortname} -Version: 2.2.0 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Zanata client module Group: Development/Tools @@ -57,7 +51,10 @@ BuildRequires: opencsv BuildRequires: ant # dependencies in zanata-cli -BuildRequires: %mvn_exec_plugin +BuildRequires: exec-maven-plugin +BuildRequires: powermock-junit4 +BuildRequires: powermock-api-mockito +BuildRequires: powermock-core Requires: jpackage-utils Requires: java @@ -101,24 +98,9 @@ This includes submodules: %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} %pom_remove_plugin :maven-assembly-plugin %{submodule_cli} -%if 0%{?fedora} < 18 -%patch0 -%endif - - %build # -Dmaven.local.debug=true -# we delete all test class under f19 because of hamcrest compatibility issue -%if 0%{?fedora} > 19 -%mvn_build -- -Dmdep.analyze.skip=true -%endif -%if 0%{?fedora} == 19 -find . -type f -name "*Test.java" | xargs rm -%mvn_build -- -Dmdep.analyze.skip=true -DskipTests -%else -find . -type f -name "*Test.java" | xargs rm -mvn-rpmbuild package javadoc:aggregate -DskipTests -%endif +%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 @@ -137,32 +119,7 @@ mvn-rpmbuild dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile %install -%if 0%{?fedora} > 18 %mvn_install -%else -mkdir -p %{buildroot}%{_javadir} - -cp -p %{submodule_rest}/target/%{submodule_rest}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_rest}.jar -cp -p %{submodule_commands}/target/%{submodule_commands}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_commands}.jar -cp -p %{submodule_cli}/target/%{submodule_cli}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_cli}.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_rest} -cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_commands} -cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_cli} - -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -install -pm 644 %{submodule_rest}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_rest}.pom -install -pm 644 %{submodule_commands}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_commands}.pom -install -pm 644 %{submodule_cli}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_cli}.pom - -%add_maven_depmap JPP-%{name}.pom -%add_maven_depmap JPP-%{submodule_rest}.pom %{submodule_rest}.jar -%add_maven_depmap JPP-%{submodule_commands}.pom %{submodule_commands}.jar -%add_maven_depmap JPP-%{submodule_cli}.pom %{submodule_cli}.jar -%endif - rest_cp=$(cat %{submodule_rest}/target/%{submodule_rest}-classpath.txt) commands_cp=$(cat %{submodule_commands}/target/%{submodule_commands}-classpath.txt) @@ -215,22 +172,16 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files -f .mfiles -%if 0%{?fedora} > 18 %dir %{_javadir}/%{name} -%endif %attr(0755,root,root) %{_bindir}/zanata-cli %doc README.txt -%if 0%{?fedora} > 18 %files javadoc -f .mfiles-javadoc -%else -%files javadoc -%{_javadocdir}/%{name}/%{submodule_rest} -%{_javadocdir}/%{name}/%{submodule_commands} -%{_javadocdir}/%{name}/%{submodule_cli} -%endif %changelog +* Wed Aug 28 2013 Patrick Huang 3.1.0-1 +- Upstream update + * Sun Aug 04 2013 Fedora Release Engineering - 2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b71fa12bc9f4ce60fc4a15dcadbc3fe4a82489d9 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 27 Aug 2013 22:58:27 -0400 Subject: [PATCH 03/38] upstream source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7e154e7..9a14463 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /client-2.2.0.zip +/client-3.1.0.zip diff --git a/sources b/sources index 7718596..c92cefc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a63d56d4a11fa48f7fbda5f0efbe0cf9 client-2.2.0.zip +8dacf039e3367953d9f3da72f347155e client-3.1.0.zip From 829d9529adbb89594f85da4c3700d24ab31f5fc7 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Wed, 28 Aug 2013 20:28:25 -0400 Subject: [PATCH 04/38] Upstream update for newer version of RESTEasy --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 1358218..86110b5 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -5,7 +5,7 @@ %global submodule_cli zanata-cli Name: zanata-%{shortname} -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Zanata client module @@ -179,6 +179,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Wed Aug 28 2013 Patrick Huang 3.1.1-1 +- Upstream update for newer version of RESTEasy + * Wed Aug 28 2013 Patrick Huang 3.1.0-1 - Upstream update From f92c6ff46cab8adbbb10cc790697d3016939e810 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Wed, 28 Aug 2013 21:29:48 -0400 Subject: [PATCH 05/38] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9a14463..3a85a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /client-2.2.0.zip /client-3.1.0.zip +/client-3.1.1.zip diff --git a/sources b/sources index c92cefc..8e10f19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8dacf039e3367953d9f3da72f347155e client-3.1.0.zip +4d52b656419b62a36c4a3fd867aa7676 client-3.1.1.zip From b934003541ec00e23b335310b0242dba9744f7d4 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 3 Sep 2013 20:45:37 -0400 Subject: [PATCH 06/38] update to latest upstream --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3a85a8c..3db47a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /client-2.2.0.zip /client-3.1.0.zip /client-3.1.1.zip +/client-3.1.2.zip diff --git a/sources b/sources index 8e10f19..7e31106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d52b656419b62a36c4a3fd867aa7676 client-3.1.1.zip +60250a7b656a059d9f5c627733f37480 client-3.1.2.zip diff --git a/zanata-client.spec b/zanata-client.spec index 86110b5..1de3b61 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -5,7 +5,7 @@ %global submodule_cli zanata-cli Name: zanata-%{shortname} -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: Zanata client module @@ -30,16 +30,13 @@ BuildRequires: zanata-parent BuildRequires: zanata-api BuildRequires: junit BuildRequires: resteasy -%if 0%{?fedora} < 19 -BuildRequires: apache-james-project -%endif # dependencies in zanata-common-commands BuildRequires: zanata-common BuildRequires: mockito BuildRequires: apache-commons-configuration BuildRequires: log4j -BuildRequires: args4j +BuildRequires: args4j >= 2.0.25 BuildRequires: openprops BuildRequires: apache-commons-collections BuildRequires: guava @@ -179,6 +176,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Wed Sep 4 2013 Patrick Huang 3.1.2-1 +- Upstream update + * Wed Aug 28 2013 Patrick Huang 3.1.1-1 - Upstream update for newer version of RESTEasy From 88387e3dce1dca9bd72021e7ef96a124318c602a Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Wed, 29 Jan 2014 19:14:55 -0500 Subject: [PATCH 07/38] upgrade to latest upstream version --- .gitignore | 1 + slf4j-backward-compatible-fix.patch | 13 ----- sources | 2 +- zanata-client.spec | 85 ++++++++++++----------------- 4 files changed, 38 insertions(+), 63 deletions(-) delete mode 100644 slf4j-backward-compatible-fix.patch 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/slf4j-backward-compatible-fix.patch b/slf4j-backward-compatible-fix.patch deleted file mode 100644 index 318681c..0000000 --- a/slf4j-backward-compatible-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -index a625bc1..46e0ab1 100644 ---- zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -+++ zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -@@ -646,7 +646,7 @@ public class PushCommand extends PushPullCommand - } - else - { -- log.info("pushing target doc [name={} size={} client-locale={}] to server [locale={}] (skipped due to dry run)", srcDoc.getName(), targetDoc.getTextFlowTargets().size(), locale.getLocalLocale(), locale.getLocale()); -+ log.info("pushing target doc [name={} size={} client-locale={}] to server [locale={}] (skipped due to dry run)", new Object[] {srcDoc.getName(), targetDoc.getTextFlowTargets().size(), locale.getLocalLocale(), locale.getLocale()}); - } - } - 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..965cc46 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.0 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: zanata-parent -BuildRequires: zanata-api -BuildRequires: junit -BuildRequires: resteasy - -# dependencies in zanata-common-commands -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 +BuildRequires: mvn(org.simpleframework:simple) +BuildRequires: zanata-parent +BuildRequires: zanata-api +BuildRequires: xom +BuildRequires: zanata-common +BuildRequires: args4j >= 2.0.25 +BuildRequires: opencsv +BuildRequires: openprops +BuildRequires: jgettext +BuildRequires: mvn(net.sourceforge.findbugs:annotations) -Requires: jpackage-utils -Requires: java - -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" "net.sourceforge.findbugsannotations2.0.2" %{submodule_cli} +%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{submodule_cli} + +%pom_remove_dep com.google.code.findbugs:annotations %{submodule_commands} +%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{submodule_commands} +%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{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,8 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Wed Sep 4 2013 Patrick Huang 3.1.2-1 -- Upstream update +* Thu Jan 09 2014 Patrick Huang 3.3.0-1 +- Latest upstream version * Wed Aug 28 2013 Patrick Huang 3.1.1-1 - Upstream update for newer version of RESTEasy From df57a398816d08ce660817d33a9c1c9a4386e6be Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 14:20:46 +0100 Subject: [PATCH 08/38] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 965cc46..827ace7 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ Name: zanata-%{shortname} Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools @@ -163,6 +163,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Fri Mar 28 2014 Michael Simacek - 3.3.0-2 +- Use Requires: java-headless rebuild (#1067528) + * Thu Jan 09 2014 Patrick Huang 3.3.0-1 - Latest upstream version From f4d39fbc53d5aaeb19e53ca02b809255f2e86b6b Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 21:42:59 -0400 Subject: [PATCH 09/38] upgrade to latest upstream --- .gitignore | 1 + slf4j-backward-compatible-fix.patch | 13 ----- sources | 2 +- zanata-client.spec | 88 +++++++++++++---------------- 4 files changed, 41 insertions(+), 63 deletions(-) delete mode 100644 slf4j-backward-compatible-fix.patch 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/slf4j-backward-compatible-fix.patch b/slf4j-backward-compatible-fix.patch deleted file mode 100644 index 318681c..0000000 --- a/slf4j-backward-compatible-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -index a625bc1..46e0ab1 100644 ---- zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -+++ zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java -@@ -646,7 +646,7 @@ public class PushCommand extends PushPullCommand - } - else - { -- log.info("pushing target doc [name={} size={} client-locale={}] to server [locale={}] (skipped due to dry run)", srcDoc.getName(), targetDoc.getTextFlowTargets().size(), locale.getLocalLocale(), locale.getLocale()); -+ log.info("pushing target doc [name={} size={} client-locale={}] to server [locale={}] (skipped due to dry run)", new Object[] {srcDoc.getName(), targetDoc.getTextFlowTargets().size(), locale.getLocalLocale(), locale.getLocale()}); - } - } - 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: zanata-parent -BuildRequires: zanata-api -BuildRequires: junit -BuildRequires: resteasy - -# dependencies in zanata-common-commands -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 +BuildRequires: mvn(org.simpleframework:simple) +BuildRequires: zanata-parent +BuildRequires: zanata-api +BuildRequires: xom +BuildRequires: zanata-common +BuildRequires: args4j >= 2.0.25 +BuildRequires: opencsv +BuildRequires: openprops +BuildRequires: jgettext +BuildRequires: mvn(net.sourceforge.findbugs:annotations) -Requires: jpackage-utils -Requires: java - -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" "net.sourceforge.findbugsannotations2.0.2" %{submodule_cli} +%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{submodule_cli} + +%pom_remove_dep com.google.code.findbugs:annotations %{submodule_commands} +%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{submodule_commands} +%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{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 3.1.2-1 -- Upstream update +* Mon Jun 02 2014 Patrick Huang 3.3.2-1 +- Latest upstream version + +* Thu Jan 09 2014 Patrick Huang 3.3.0-1 +- Latest upstream version * Wed Aug 28 2013 Patrick Huang 3.1.1-1 - Upstream update for newer version of RESTEasy From 3ebb7cc0720b217f392bd0576f1b820ed19b9dc9 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 21:43:51 -0400 Subject: [PATCH 10/38] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2920995..a69d50f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /client-3.1.1.zip /client-3.1.2.zip /client-3.3.0.zip +/client-3.3.2.zip diff --git a/sources b/sources index 4c5c502..31bd2c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -810f65eee5bc439b34625a4854327dca client-3.3.0.zip +b06641bc95132646ec71dfb516dd303b client-3.3.2.zip From 6de0f0e217f8fcb2425083fa07239b73e36d0e92 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 21:50:27 -0400 Subject: [PATCH 11/38] upgrade to latest upstream --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2920995..a69d50f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /client-3.1.1.zip /client-3.1.2.zip /client-3.3.0.zip +/client-3.3.2.zip diff --git a/sources b/sources index 4c5c502..31bd2c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -810f65eee5bc439b34625a4854327dca client-3.3.0.zip +b06641bc95132646ec71dfb516dd303b client-3.3.2.zip diff --git a/zanata-client.spec b/zanata-client.spec index 827ace7..68cbf5c 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -5,8 +5,8 @@ %global submodule_cli zanata-cli Name: zanata-%{shortname} -Version: 3.3.0 -Release: 2%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: Zanata client module Group: Development/Tools @@ -163,6 +163,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Mon Jun 02 2014 Patrick Huang 3.3.2-1 +- Latest upstream version + * Fri Mar 28 2014 Michael Simacek - 3.3.0-2 - Use Requires: java-headless rebuild (#1067528) From ccdb632e731858c54b5f4af6d8af73192252e728 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:59:53 -0500 Subject: [PATCH 12/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 68cbf5c..1caab81 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ Name: zanata-%{shortname} Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools @@ -163,6 +163,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Jun 02 2014 Patrick Huang 3.3.2-1 - Latest upstream version From 9994561df313c0e677d7e214b92a66c46a3e91f1 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Fri, 18 Jul 2014 00:05:24 -0400 Subject: [PATCH 13/38] remove xom dependency and add SNI fix --- zanata-client.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index 93fb4a5..8e9e5f1 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,13 +6,14 @@ Name: zanata-%{shortname} Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools License: LGPLv2+ URL: https://github.com/zanata/%{name} Source0: https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip +Patch0: sni.patch BuildArch: noarch @@ -28,7 +29,6 @@ BuildRequires: powermock-core BuildRequires: mvn(org.simpleframework:simple) BuildRequires: zanata-parent BuildRequires: zanata-api -BuildRequires: xom BuildRequires: zanata-common BuildRequires: args4j >= 2.0.25 BuildRequires: opencsv @@ -44,7 +44,6 @@ Requires: args4j >= 2.0.25 Requires: opencsv Requires: openprops Requires: jgettext -Requires: xom %description @@ -65,6 +64,8 @@ This includes submodules: %prep %setup -q -n %{name}-%{shortname}-%{version} +%patch0 + %pom_disable_module zanata-maven-plugin %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} %pom_remove_plugin :maven-assembly-plugin %{submodule_cli} @@ -139,7 +140,7 @@ fi # Configuration MAIN_CLASS=org.zanata.client.ZanataClient -BASE_JARS="%{submodule_rest} %{submodule_commands} %{submodule_cli} slf4j/log4j12 opencsv" +BASE_JARS="%{name} slf4j/log4j12 opencsv" CLASSPATH=%{CLASSPATH} # Set parameters @@ -163,6 +164,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Fri Jul 18 2014 Patrick Huang 3.3.2-2 +- Remove xom dependency and fix executable script + * Mon Jun 02 2014 Patrick Huang 3.3.2-1 - Latest upstream version From cdb6ad9ff190d67ff6ade3863aa0f4ff2b6c69e4 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Fri, 18 Jul 2014 00:06:26 -0400 Subject: [PATCH 14/38] patch for SNI --- sni.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 sni.patch diff --git a/sni.patch b/sni.patch new file mode 100644 index 0000000..7772d0b --- /dev/null +++ b/sni.patch @@ -0,0 +1,88 @@ +diff --git pom.xml pom.xml +index e605ef1..773e5ca 100644 +--- pom.xml ++++ pom.xml +@@ -175,7 +175,7 @@ + + org.apache.httpcomponents + httpclient +- 4.3.3 ++ 4.2.5 + + + commons-logging +diff --git zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java +index 9a59c61..7d1fb4b 100644 +--- zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java ++++ zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java +@@ -9,6 +9,7 @@ import java.net.Socket; + import java.net.URI; + import java.net.URISyntaxException; + import java.net.URL; ++import java.net.UnknownHostException; + import java.security.SecureRandom; + import java.security.cert.CertificateException; + import java.security.cert.X509Certificate; +@@ -29,6 +30,7 @@ import org.apache.http.conn.scheme.Scheme; + import org.apache.http.conn.ssl.SSLSocketFactory; + import org.apache.http.conn.ssl.X509HostnameVerifier; + import org.apache.http.impl.client.DefaultHttpClient; ++import org.apache.http.params.HttpParams; + import org.apache.http.protocol.HttpContext; + import org.apache.maven.artifact.versioning.DefaultArtifactVersion; + import org.jboss.resteasy.client.ClientExecutor; +@@ -137,28 +139,34 @@ public class ZanataProxyFactory implements ITranslationResourcesFactory { + + sslContext.init(null, trustAllCerts, new SecureRandom()); + +- SSLSocketFactory factory = new SSLSocketFactory(sslContext) { +- @Override +- public Socket connectSocket( +- int connectTimeout, +- Socket socket, +- HttpHost host, +- InetSocketAddress remoteAddress, +- InetSocketAddress localAddress, +- HttpContext context) throws IOException, +- ConnectTimeoutException { +- if (socket instanceof SSLSocket) { +- try { +- PropertyUtils.setProperty(socket, "host", +- host.getHostName()); +- } catch (Exception ex) { +- log.warn("Unable to enable SNI; you may have trouble connecting to some secure hosts. Please ensure that you are running Java 1.7 or later."); ++ SSLSocketFactory factory; ++ if (sslCertDisabled) { ++ // avoid triggering the problem described here: ++ // https://stackoverflow.com/questions/7615645/ssl-handshake-alert-unrecognized-name-error-since-upgrade-to-java-1-7-0 ++ factory = new SSLSocketFactory(sslContext); ++ } else { ++ factory = new SSLSocketFactory(sslContext) { ++ // NB: This is only for httpcomponents-client 4.2, not 4.3 ++ @Override ++ public Socket connectSocket(Socket socket, ++ InetSocketAddress remoteAddress, ++ InetSocketAddress localAddress, ++ HttpParams params) ++ throws IOException, UnknownHostException, ++ ConnectTimeoutException { ++ if (socket instanceof SSLSocket) { ++ try { ++ PropertyUtils.setProperty(socket, "host", ++ remoteAddress.getHostName()); ++ } catch (Exception ex) { ++ log.warn("Unable to enable SNI; you may have trouble connecting to some secure hosts. Please ensure that you are running Java 1.7 or later."); ++ } + } ++ return super.connectSocket(socket, remoteAddress, ++ localAddress, params); + } +- return super.connectSocket(connectTimeout, socket, host, remoteAddress, +- localAddress, context); +- } +- }; ++ }; ++ } + + HttpClient client = new DefaultHttpClient(); + From 1a7f2b4a89848bd2142e7922d3ce141f9bde8472 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 20 Jul 2014 20:51:00 -0400 Subject: [PATCH 15/38] add version restriction to certain dependencies --- zanata-client.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index 8e9e5f1..0bde506 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ Name: zanata-%{shortname} Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata client module Group: Development/Tools @@ -28,8 +28,8 @@ BuildRequires: powermock-api-mockito BuildRequires: powermock-core BuildRequires: mvn(org.simpleframework:simple) BuildRequires: zanata-parent -BuildRequires: zanata-api -BuildRequires: zanata-common +BuildRequires: zanata-api >= 3.3.1 +BuildRequires: zanata-common >= 3.3.0-4 BuildRequires: args4j >= 2.0.25 BuildRequires: opencsv BuildRequires: openprops @@ -38,8 +38,8 @@ BuildRequires: mvn(net.sourceforge.findbugs:annotations) Requires: resteasy >= 3.0.1 Requires: mvn(org.apache.commons:commons-exec) -Requires: zanata-api -Requires: zanata-common +Requires: zanata-api >= 3.3.1 +Requires: zanata-common >= 3.3.0-4 Requires: args4j >= 2.0.25 Requires: opencsv Requires: openprops @@ -164,6 +164,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Mon Jul 21 2014 Patrick Huang 3.3.2-3 +- Add version restrictions to certain dependencies + * Fri Jul 18 2014 Patrick Huang 3.3.2-2 - Remove xom dependency and fix executable script From f2086ad19108e1938d8cf3797a3f75fc48f9d827 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 27 Jul 2014 21:27:22 -0400 Subject: [PATCH 16/38] Add version restriction and fix exec script classpath --- zanata-client.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index 1caab81..004ae03 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ Name: zanata-%{shortname} Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata client module Group: Development/Tools @@ -27,9 +27,9 @@ BuildRequires: powermock-api-mockito BuildRequires: powermock-core BuildRequires: mvn(org.simpleframework:simple) BuildRequires: zanata-parent -BuildRequires: zanata-api +BuildRequires: zanata-api >= 3.3.1 BuildRequires: xom -BuildRequires: zanata-common +BuildRequires: zanata-common >= 3.3.0 BuildRequires: args4j >= 2.0.25 BuildRequires: opencsv BuildRequires: openprops @@ -139,7 +139,7 @@ fi # Configuration MAIN_CLASS=org.zanata.client.ZanataClient -BASE_JARS="%{submodule_rest} %{submodule_commands} %{submodule_cli} slf4j/log4j12 opencsv" +BASE_JARS="%{name} slf4j/log4j12 opencsv" CLASSPATH=%{CLASSPATH} # Set parameters @@ -163,6 +163,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Mon Jul 28 2014 Patrick Huang 3.3.2-3 +- Add version restriction and fix exec script classpath + * Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 2fab54a549e541cf3aa58b469e74f89713f8ef74 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 2 Feb 2015 16:43:03 +1000 Subject: [PATCH 17/38] Upstream update to 3.4.1 --- zanata-client.spec | 76 +++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 34 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" "net.sourceforge.findbugsannotations2.0.2" %{submodule_cli} -%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{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" "com.suntools" %{submodule_cli} -%pom_remove_dep com.google.code.findbugs:annotations %{submodule_commands} -%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{submodule_commands} -%pom_xpath_inject "pom:dependencies" "com.google.code.findbugsjsr3052.0.1" %{submodule_commands} +# Ensure it compile with supported java version +%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{java_version}%{java_version}truetrue" # 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 # 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 3.4.1-1 +- Upstream update to 3.4.1 + * Mon Jul 28 2014 Patrick Huang 3.3.2-3 - Add version restriction and fix exec script classpath From 7f4990f0288d10c706f3299ee235ad1402037998 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 2 Feb 2015 16:47:30 +1000 Subject: [PATCH 18/38] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a69d50f..2cf5f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /client-3.1.2.zip /client-3.3.0.zip /client-3.3.2.zip +/client-3.4.1.zip diff --git a/sources b/sources index 31bd2c9..6a06a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b06641bc95132646ec71dfb516dd303b client-3.3.2.zip +b62696b351581d7ef6d47bce26aba5fa client-3.4.1.zip From 2f0061c7ecacaa60ed0925fc6a4be0e9f57dffaf Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 2 Feb 2015 17:28:11 +1000 Subject: [PATCH 19/38] Remove patch 0 --- zanata-client.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 4313b37..7a3b7e7 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -71,7 +71,6 @@ This includes sub modules: %prep %setup -q -n %{name}-%{shortname}-%{version} -%patch0 %pom_disable_module zanata-maven-plugin %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} From 302f7ef876742b2e9ac848ec486ec19a1510181b Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 3 Mar 2015 15:25:18 +1000 Subject: [PATCH 20/38] Update to 3.4.2 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2cf5f9c..8515892 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /client-3.3.0.zip /client-3.3.2.zip /client-3.4.1.zip +/client-3.4.2.zip diff --git a/sources b/sources index 6a06a3a..d670f71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b62696b351581d7ef6d47bce26aba5fa client-3.4.1.zip +5dea9fd6c4724d10223c1dc06b82ee3d client-3.4.2.zip diff --git a/zanata-client.spec b/zanata-client.spec index 7a3b7e7..c53d120 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ %global java_version 1.7 Name: zanata-%{shortname} -Version: 3.4.1 +Version: 3.4.2 Release: 1%{?dist} Summary: Zanata client module @@ -169,6 +169,10 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Tue Mar 03 2015 Ding-Yi Chen 3.4.2-1 +- Upstream update to 3.4.1 +- Include licence (LGPL 2.1) in dist archives + * Mon Feb 02 2015 Ding-Yi Chen 3.4.1-1 - Upstream update to 3.4.1 From 94da71d185ea660ef7b73d61bc2a87c62b65b6fc Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 31 Mar 2015 14:55:49 +1000 Subject: [PATCH 21/38] Upstream update to 3.6.0 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8515892..2f507e3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /client-3.3.2.zip /client-3.4.1.zip /client-3.4.2.zip +/client-3.6.0.zip diff --git a/sources b/sources index d670f71..28e4372 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dea9fd6c4724d10223c1dc06b82ee3d client-3.4.2.zip +fcde95fa1e0b6d75440852c96bf6e987 client-3.6.0.zip diff --git a/zanata-client.spec b/zanata-client.spec index c53d120..ac3f834 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ %global java_version 1.7 Name: zanata-%{shortname} -Version: 3.4.2 +Version: 3.6.0 Release: 1%{?dist} Summary: Zanata client module @@ -169,8 +169,12 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Tue Mar 31 2015 Ding-Yi Chen 3.6.0-1 +- Upstream update to 3.6.0 +- Detail documentation https://github.com/zanata/zanata-client/tree/master/docs + * Tue Mar 03 2015 Ding-Yi Chen 3.4.2-1 -- Upstream update to 3.4.1 +- Upstream update to 3.4.2 - Include licence (LGPL 2.1) in dist archives * Mon Feb 02 2015 Ding-Yi Chen 3.4.1-1 From 7def194f1d335e58ab8e846902ae88506bded5c1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:42:38 +0000 Subject: [PATCH 22/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index ac3f834..4f3aeac 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -7,7 +7,7 @@ Name: zanata-%{shortname} Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools @@ -169,6 +169,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Mar 31 2015 Ding-Yi Chen 3.6.0-1 - Upstream update to 3.6.0 - Detail documentation https://github.com/zanata/zanata-client/tree/master/docs From 6f93a5184eff6c88ee69a0684a81a832ad9f80fb Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 14 Jul 2015 13:18:18 +1000 Subject: [PATCH 23/38] Update spec for 3.7.3 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 68 ++++++++++++++++++++++++++++++---------------- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 2f507e3..8e3001f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /client-3.4.1.zip /client-3.4.2.zip /client-3.6.0.zip +/client-3.7.3.zip diff --git a/sources b/sources index 28e4372..1981491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcde95fa1e0b6d75440852c96bf6e987 client-3.6.0.zip +9bd5c490d93ab24bb53571ea337069f7 client-3.7.3.zip diff --git a/zanata-client.spec b/zanata-client.spec index 4f3aeac..2a7f067 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -5,9 +5,20 @@ %global submodule_cli zanata-cli %global java_version 1.7 +%global jersey_min_version 1.17 +%global zanata_parent_version 3.7.3 +%global zanata_api_version 3.7.3 +%global zanata_common_version 3.7.2 +%if 0%{?fedora} >= 23 +%global jersey_pkg_name jersey1 +%else +%global jersey_pkg_name jersey +%endif +%global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) + Name: zanata-%{shortname} -Version: 3.6.0 -Release: 2%{?dist} +Version: 3.7.3 +Release: 1%{?dist} Summary: Zanata client module Group: Development/Tools @@ -18,40 +29,44 @@ Source0: https://github.com/zanata/%{name}/archive/%{shortname}-%{version 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: powermock-junit4 -BuildRequires: powermock-api-mockito -BuildRequires: powermock-core -BuildRequires: zanata-parent -BuildRequires: zanata-api >= 3.3.1 -BuildRequires: xom -BuildRequires: zanata-common >= 3.3.0 +BuildRequires: java-devel >= 1:%{java_version} BuildRequires: args4j >= 2.0.25 -BuildRequires: opencsv -BuildRequires: openprops +BuildRequires: exec-maven-plugin +BuildRequires: %{jersey_pkg_name} >= %{jersey_min_version} +BuildRequires: %{jersey_pkg_name}-contribs >= %{jersey_min_version} +BuildRequires: jetty-servlet +BuildRequires: jetty-servlets BuildRequires: jgettext +BuildRequires: maven-dependency-plugin BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(org.apache.commons:commons-exec) 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} +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: opencsv +BuildRequires: openprops +BuildRequires: powermock-api-mockito +BuildRequires: powermock-core +BuildRequires: powermock-junit4 +BuildRequires: resteasy >= 3.0.1 +BuildRequires: xom +BuildRequires: zanata-parent >= %{zanata_parent_version} +BuildRequires: zanata-api >= %{zanata_api_version} +BuildRequires: zanata-common >= %{zanata_common_version} Requires: java-headless >= 1:%{java_version} -Requires: resteasy >= 3.0.1 -Requires: mvn(org.apache.commons:commons-exec) -Requires: zanata-api -Requires: zanata-common Requires: args4j >= 2.0.25 +Requires: %{jersey_pkg_name} >= %{jersey_min_version} +Requires: %{jersey_pkg_name}-contribs >= %{jersey_min_version} +Requires: jgettext +Requires: mvn(org.apache.commons:commons-exec) Requires: opencsv Requires: openprops -Requires: jgettext Requires: xom - +Requires: zanata-api >= %{zanata_api_version} +Requires: zanata-common >= %{zanata_common_version} %description Zanata client modules. @@ -82,6 +97,8 @@ This includes sub modules: %pom_remove_dep org.powermock:powermock-module-junit4 %{submodule_cli} %pom_xpath_inject "pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions" "com.suntools" %{submodule_cli} +%pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} + # Ensure it compile with supported java version %pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{java_version}%{java_version}truetrue" @@ -102,7 +119,7 @@ rm %{submodule_commands}/src/test/java/org/zanata/client/commands/pull/*.java %build # -Dmaven.local.debug=true -%mvn_build -X -G -- -Dmdep.analyze.skip=true -DfailIfNoTests=false -DskipTests=true dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile=%{name}-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 @@ -169,6 +186,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Tue Jul 14 2015 Ding-Yi Chen 3.7.3-1 +- Upgrade to upstream version 3.7.3 + * Fri Jun 19 2015 Fedora Release Engineering - 3.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 7563306bdef75d4da057aad44af1f8a0891c93a1 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 14:14:22 +1000 Subject: [PATCH 24/38] fix(dependency): zanata-parent version should be 24 --- zanata-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 2a7f067..e1d5a90 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -6,7 +6,7 @@ %global java_version 1.7 %global jersey_min_version 1.17 -%global zanata_parent_version 3.7.3 +%global zanata_parent_version 24 %global zanata_api_version 3.7.3 %global zanata_common_version 3.7.2 %if 0%{?fedora} >= 23 From 9be3662883ad1ead01ad7c254b90acbe2f0486f0 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 10 Aug 2015 14:50:39 +1000 Subject: [PATCH 25/38] Release zanata-client-3.7.4-1 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e3001f..34f5320 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /client-3.4.2.zip /client-3.6.0.zip /client-3.7.3.zip +/client-3.7.4.zip diff --git a/sources b/sources index 1981491..edd760f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bd5c490d93ab24bb53571ea337069f7 client-3.7.3.zip +2da5014dbdc4fbeab137fcb39ed7f60c client-3.7.4.zip diff --git a/zanata-client.spec b/zanata-client.spec index e1d5a90..f9f89b9 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -17,7 +17,7 @@ %global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) Name: zanata-%{shortname} -Version: 3.7.3 +Version: 3.7.4 Release: 1%{?dist} Summary: Zanata client module @@ -186,6 +186,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Mon Aug 10 2015 Ding-Yi Chen 3.7.4-1 +- Upgrade to upstream version 3.7.4 + * Tue Jul 14 2015 Ding-Yi Chen 3.7.3-1 - Upgrade to upstream version 3.7.3 From 476eab306eaae6dc0dbba82a274d7daaada9ec00 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 23 Nov 2015 09:47:38 +1000 Subject: [PATCH 26/38] - Upgrade to upstream version 3.8.1 - Now require Java 1.8 --- .gitignore | 1 + sni.patch | 88 ---------------------------------------------- sources | 2 +- zanata-client.spec | 21 +++++------ 4 files changed, 13 insertions(+), 99 deletions(-) delete mode 100644 sni.patch diff --git a/.gitignore b/.gitignore index 34f5320..a4ea146 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /client-3.6.0.zip /client-3.7.3.zip /client-3.7.4.zip +/client-3.8.1.zip diff --git a/sni.patch b/sni.patch deleted file mode 100644 index 7772d0b..0000000 --- a/sni.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git pom.xml pom.xml -index e605ef1..773e5ca 100644 ---- pom.xml -+++ pom.xml -@@ -175,7 +175,7 @@ - - org.apache.httpcomponents - httpclient -- 4.3.3 -+ 4.2.5 - - - commons-logging -diff --git zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java -index 9a59c61..7d1fb4b 100644 ---- zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java -+++ zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java -@@ -9,6 +9,7 @@ import java.net.Socket; - import java.net.URI; - import java.net.URISyntaxException; - import java.net.URL; -+import java.net.UnknownHostException; - import java.security.SecureRandom; - import java.security.cert.CertificateException; - import java.security.cert.X509Certificate; -@@ -29,6 +30,7 @@ import org.apache.http.conn.scheme.Scheme; - import org.apache.http.conn.ssl.SSLSocketFactory; - import org.apache.http.conn.ssl.X509HostnameVerifier; - import org.apache.http.impl.client.DefaultHttpClient; -+import org.apache.http.params.HttpParams; - import org.apache.http.protocol.HttpContext; - import org.apache.maven.artifact.versioning.DefaultArtifactVersion; - import org.jboss.resteasy.client.ClientExecutor; -@@ -137,28 +139,34 @@ public class ZanataProxyFactory implements ITranslationResourcesFactory { - - sslContext.init(null, trustAllCerts, new SecureRandom()); - -- SSLSocketFactory factory = new SSLSocketFactory(sslContext) { -- @Override -- public Socket connectSocket( -- int connectTimeout, -- Socket socket, -- HttpHost host, -- InetSocketAddress remoteAddress, -- InetSocketAddress localAddress, -- HttpContext context) throws IOException, -- ConnectTimeoutException { -- if (socket instanceof SSLSocket) { -- try { -- PropertyUtils.setProperty(socket, "host", -- host.getHostName()); -- } catch (Exception ex) { -- log.warn("Unable to enable SNI; you may have trouble connecting to some secure hosts. Please ensure that you are running Java 1.7 or later."); -+ SSLSocketFactory factory; -+ if (sslCertDisabled) { -+ // avoid triggering the problem described here: -+ // https://stackoverflow.com/questions/7615645/ssl-handshake-alert-unrecognized-name-error-since-upgrade-to-java-1-7-0 -+ factory = new SSLSocketFactory(sslContext); -+ } else { -+ factory = new SSLSocketFactory(sslContext) { -+ // NB: This is only for httpcomponents-client 4.2, not 4.3 -+ @Override -+ public Socket connectSocket(Socket socket, -+ InetSocketAddress remoteAddress, -+ InetSocketAddress localAddress, -+ HttpParams params) -+ throws IOException, UnknownHostException, -+ ConnectTimeoutException { -+ if (socket instanceof SSLSocket) { -+ try { -+ PropertyUtils.setProperty(socket, "host", -+ remoteAddress.getHostName()); -+ } catch (Exception ex) { -+ log.warn("Unable to enable SNI; you may have trouble connecting to some secure hosts. Please ensure that you are running Java 1.7 or later."); -+ } - } -+ return super.connectSocket(socket, remoteAddress, -+ localAddress, params); - } -- return super.connectSocket(connectTimeout, socket, host, remoteAddress, -- localAddress, context); -- } -- }; -+ }; -+ } - - HttpClient client = new DefaultHttpClient(); - diff --git a/sources b/sources index edd760f..e204638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2da5014dbdc4fbeab137fcb39ed7f60c client-3.7.4.zip +82abe84704d6168d49431ec96316c819 client-3.8.1.zip diff --git a/zanata-client.spec b/zanata-client.spec index f9f89b9..8b5d7cf 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -3,12 +3,12 @@ %global submodule_rest zanata-rest-%{shortname} %global submodule_commands zanata-%{shortname}-commands %global submodule_cli zanata-cli -%global java_version 1.7 +%global java_ver_min 1.7 %global jersey_min_version 1.17 -%global zanata_parent_version 24 -%global zanata_api_version 3.7.3 -%global zanata_common_version 3.7.2 +%global zanata_parent_version 25 +%global zanata_api_version 3.8.3 +%global zanata_common_version 3.8.1 %if 0%{?fedora} >= 23 %global jersey_pkg_name jersey1 %else @@ -17,7 +17,7 @@ %global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) Name: zanata-%{shortname} -Version: 3.7.4 +Version: 3.8.1 Release: 1%{?dist} Summary: Zanata client module @@ -29,7 +29,7 @@ Source0: https://github.com/zanata/%{name}/archive/%{shortname}-%{version BuildArch: noarch BuildRequires: maven-local -BuildRequires: java-devel >= 1:%{java_version} +BuildRequires: java-devel >= 1:%{java_ver_min} BuildRequires: args4j >= 2.0.25 BuildRequires: exec-maven-plugin BuildRequires: %{jersey_pkg_name} >= %{jersey_min_version} @@ -56,7 +56,7 @@ BuildRequires: zanata-parent >= %{zanata_parent_version} BuildRequires: zanata-api >= %{zanata_api_version} BuildRequires: zanata-common >= %{zanata_common_version} -Requires: java-headless >= 1:%{java_version} +Requires: java-headless >= 1:%{java_ver_min} Requires: args4j >= 2.0.25 Requires: %{jersey_pkg_name} >= %{jersey_min_version} Requires: %{jersey_pkg_name}-contribs >= %{jersey_min_version} @@ -100,7 +100,7 @@ This includes sub modules: %pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} # Ensure it compile with supported java version -%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{java_version}%{java_version}truetrue" +%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{java_ver_min}%{java_ver_min}truetrue" # simpleframework in fedora is too old rm %{submodule_cli}/src/test/java/org/zanata/client/HTTPMockContainer.java @@ -186,8 +186,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Mon Aug 10 2015 Ding-Yi Chen 3.7.4-1 -- Upgrade to upstream version 3.7.4 +* Sun Nov 22 2015 Ding-Yi Chen 3.8.1-1 +- Upgrade to upstream version 3.8.1 +- Now require Java 1.8 * Tue Jul 14 2015 Ding-Yi Chen 3.7.3-1 - Upgrade to upstream version 3.7.3 From 62d3a1d7cc05cf557c2eb2b7f7191d3bc3d2e4a6 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 26 Nov 2015 17:00:25 +1000 Subject: [PATCH 27/38] - Fix the case that alternative does not point to 1.8.0 or later. --- zanata-client.spec | 77 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index 8b5d7cf..f68ad72 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -3,7 +3,8 @@ %global submodule_rest zanata-rest-%{shortname} %global submodule_commands zanata-%{shortname}-commands %global submodule_cli zanata-cli -%global java_ver_min 1.7 +%global javac_source_ver 1.8 +%global java_ver_min %{javac_source_ver}.0 %global jersey_min_version 1.17 %global zanata_parent_version 25 @@ -18,7 +19,7 @@ Name: zanata-%{shortname} Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools @@ -87,20 +88,28 @@ This includes sub modules: %prep %setup -q -n %{name}-%{shortname}-%{version} +## main %pom_disable_module zanata-maven-plugin -%pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} -%pom_remove_plugin :maven-assembly-plugin %{submodule_cli} %pom_remove_plugin :findbugs-maven-plugin %pom_remove_dep org.simpleframework:simple +%pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} + +# Ensure it compile with supported java version +%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{javac_source_ver}%{javac_source_ver}truetrue" + +## rest +%pom_remove_plugin :duplicate-finder-maven-plugin %{submodule_rest} + +## command %pom_remove_dep org.simpleframework:simple %{submodule_commands} + +## cli +%pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} +%pom_remove_plugin :maven-assembly-plugin %{submodule_cli} %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" "com.suntools" %{submodule_cli} -%pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} - -# Ensure it compile with supported java version -%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{java_ver_min}%{java_ver_min}truetrue" # simpleframework in fedora is too old rm %{submodule_cli}/src/test/java/org/zanata/client/HTTPMockContainer.java @@ -160,6 +169,53 @@ if [ -f \$HOME/.%{name}rc ] ; then . \$HOME/.%{name}rc fi +EXIT_FATAL_MISSING_DEPENDENCY=4 + +declare -a JreVerArray +IFS="._" read -r -a JreVerMinArray <<< "%{java_ver_min}" + +function check_java_home(){ + local javaHome=\$1 + local javaCmd + + if [ -x \$javaHome/bin/java ];then + javaCmd=\$javaHome/bin/java + elif [ -x \$javaHome/jre/bin/java ];then + javaCmd=\$javaHome/jre/bin/java + else + ## No executable in javaHome + return 1 + fi + + jreVer=\$(\$javaCmd -version |& sed -n -e '/version/ s/.*"\(.*\)"/\1/ p') + IFS="._" read -r -a JreVerArray <<< "\$jreVer" + + for (( i=0; i< \${#JreVerMinArray[@]}; i++)) ;do + if [ \${JreVerArray[\$i]} -gt \${JreVerMinArray[\$i]} ];then + ## Version is newer + return 0 + elif [ \${JreVerArray[\$i]} -lt \${JreVerMinArray[\$i]} ];then + ## Version is older + return 1 + fi + done + ## version is equal + return 0 +} + +JAVA_HOME_ORIG="\$JAVA_HOME" +JAVA_HOME= +for JavaHome in "\$JAVA_HOME_ORIG" /etc/alternatives/jre_%{java_ver_min}; do + if check_java_home "\$JavaHome" ; then + JAVA_HOME=\$JavaHome + fi +done + +if [ -z "\$JAVA_HOME" ];then + echo "JRE %{java_ver_min} is not found. Please install it or specify JAVA_HOME" > /dev/stderr + exit \$EXIT_FATAL_MISSING_DEPENDENCY +fi + # Configuration MAIN_CLASS=org.zanata.client.ZanataClient BASE_JARS="%{name} slf4j/log4j12 opencsv" @@ -180,12 +236,15 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files -f .mfiles %dir %{_javadir}/%{name} -%attr(0755,root,root) %{_bindir}/zanata-cli +%{_bindir}/zanata-cli %doc README.txt %files javadoc -f .mfiles-javadoc %changelog +* Thu Nov 26 2015 Ding-Yi Chen 3.8.1-2 +- Fix the case that alternative does not point to 1.8.0 or later. + * Sun Nov 22 2015 Ding-Yi Chen 3.8.1-1 - Upgrade to upstream version 3.8.1 - Now require Java 1.8 From 3219beee8d338280129c790eda1cc39ec3c6a81d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:02:41 +0000 Subject: [PATCH 28/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index f68ad72..55bc313 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -19,7 +19,7 @@ Name: zanata-%{shortname} Version: 3.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata client module Group: Development/Tools @@ -242,6 +242,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Nov 26 2015 Ding-Yi Chen 3.8.1-2 - Fix the case that alternative does not point to 1.8.0 or later. From 3102f1e8951d4d997b4e688aa187ac7df66e5534 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 20 Apr 2016 11:31:08 +1000 Subject: [PATCH 29/38] - Upstream update to 3.8.4 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a4ea146..2595621 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /client-3.7.3.zip /client-3.7.4.zip /client-3.8.1.zip +/client-3.8.4.zip diff --git a/sources b/sources index e204638..4f14c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82abe84704d6168d49431ec96316c819 client-3.8.1.zip +a907c981b0f517e5394d0a2a294591f2 client-3.8.4.zip diff --git a/zanata-client.spec b/zanata-client.spec index 55bc313..4e54295 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -7,9 +7,9 @@ %global java_ver_min %{javac_source_ver}.0 %global jersey_min_version 1.17 -%global zanata_parent_version 25 -%global zanata_api_version 3.8.3 -%global zanata_common_version 3.8.1 +%global zanata_parent_version 27 +%global zanata_api_version 3.8.4 +%global zanata_common_version 3.8.3 %if 0%{?fedora} >= 23 %global jersey_pkg_name jersey1 %else @@ -18,8 +18,8 @@ %global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) Name: zanata-%{shortname} -Version: 3.8.1 -Release: 3%{?dist} +Version: 3.8.4 +Release: 1%{?dist} Summary: Zanata client module Group: Development/Tools @@ -242,8 +242,8 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Fri Feb 05 2016 Fedora Release Engineering - 3.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Thu Nov 26 2015 Ding-Yi Chen 3.8.4-1 +- Upstream update to 3.8.4 * Thu Nov 26 2015 Ding-Yi Chen 3.8.1-2 - Fix the case that alternative does not point to 1.8.0 or later. From fcd3d31d068722a90b17603628086ed273971070 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 18 Jul 2016 11:50:51 +1000 Subject: [PATCH 30/38] - Upstream update to version 3.9.1 --- .gitignore | 1 + sources | 2 +- zanata-client.spec | 61 +++++++++++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 2595621..05133f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /client-3.7.4.zip /client-3.8.1.zip /client-3.8.4.zip +/client-3.9.1.zip diff --git a/sources b/sources index 4f14c3f..c09a170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a907c981b0f517e5394d0a2a294591f2 client-3.8.4.zip +a76c8704e9d395384270f5bc154d0877 client-3.9.1.zip diff --git a/zanata-client.spec b/zanata-client.spec index 4e54295..4e2dca3 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -1,15 +1,17 @@ %global shortname client +%global submodule_stub_server stub-server %global submodule_rest zanata-rest-%{shortname} %global submodule_commands zanata-%{shortname}-commands %global submodule_cli zanata-cli +%global findbugs_ver_min 3.0.0 %global javac_source_ver 1.8 %global java_ver_min %{javac_source_ver}.0 - -%global jersey_min_version 1.17 -%global zanata_parent_version 27 -%global zanata_api_version 3.8.4 -%global zanata_common_version 3.8.3 +%global jersey_ver_min 1.17 +%global resteasy_ver_min 3.0.6 +%global zanata_parent_ver 28 +%global zanata_api_ver 3.9.1 +%global zanata_common_ver 3.9.1 %if 0%{?fedora} >= 23 %global jersey_pkg_name jersey1 %else @@ -18,7 +20,7 @@ %global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) Name: zanata-%{shortname} -Version: 3.8.4 +Version: 3.9.1 Release: 1%{?dist} Summary: Zanata client module @@ -33,13 +35,15 @@ BuildRequires: maven-local BuildRequires: java-devel >= 1:%{java_ver_min} BuildRequires: args4j >= 2.0.25 BuildRequires: exec-maven-plugin -BuildRequires: %{jersey_pkg_name} >= %{jersey_min_version} -BuildRequires: %{jersey_pkg_name}-contribs >= %{jersey_min_version} +BuildRequires: findbugs >= %{findbugs_ver_min} +BuildRequires: %{jersey_pkg_name} >= %{jersey_ver_min} +BuildRequires: %{jersey_pkg_name}-contribs >= %{jersey_ver_min} BuildRequires: jetty-servlet BuildRequires: jetty-servlets BuildRequires: jgettext BuildRequires: maven-dependency-plugin BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.apache.commons:commons-exec) BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin) @@ -51,26 +55,26 @@ BuildRequires: openprops BuildRequires: powermock-api-mockito BuildRequires: powermock-core BuildRequires: powermock-junit4 -BuildRequires: resteasy >= 3.0.1 +BuildRequires: resteasy >= %{resteasy_ver_min} BuildRequires: xom -BuildRequires: zanata-parent >= %{zanata_parent_version} -BuildRequires: zanata-api >= %{zanata_api_version} -BuildRequires: zanata-common >= %{zanata_common_version} +BuildRequires: zanata-parent >= %{zanata_parent_ver} +BuildRequires: zanata-api >= %{zanata_api_ver} +BuildRequires: zanata-common >= %{zanata_common_ver} Requires: java-headless >= 1:%{java_ver_min} Requires: args4j >= 2.0.25 -Requires: %{jersey_pkg_name} >= %{jersey_min_version} -Requires: %{jersey_pkg_name}-contribs >= %{jersey_min_version} +Requires: %{jersey_pkg_name} >= %{jersey_ver_min} +Requires: %{jersey_pkg_name}-contribs >= %{jersey_ver_min} Requires: jgettext Requires: mvn(org.apache.commons:commons-exec) Requires: opencsv Requires: openprops Requires: xom -Requires: zanata-api >= %{zanata_api_version} -Requires: zanata-common >= %{zanata_common_version} +Requires: zanata-api >= %{zanata_api_ver} +Requires: zanata-common >= %{zanata_common_ver} %description -Zanata client modules. +Zanata client modules. Holds most of Zanata's client code, including Zanata CLI. It also contains REST stub for interacting with a Zanata server. @@ -89,7 +93,8 @@ This includes sub modules: %setup -q -n %{name}-%{shortname}-%{version} ## main -%pom_disable_module zanata-maven-plugin +%pom_disable_module stub-server +%pom_disable_module zanata-maven-plugin %pom_remove_plugin :findbugs-maven-plugin %pom_remove_dep org.simpleframework:simple %pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} @@ -97,7 +102,12 @@ This includes sub modules: # Ensure it compile with supported java version %pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{javac_source_ver}%{javac_source_ver}truetrue" +## stub-server +#%pom_remove_dep com.google.code.findbugs:annotations %{submodule_stub_server} +%pom_remove_plugin :duplicate-finder-maven-plugin %{submodule_stub_server} + ## rest +%pom_remove_dep org.zanata:stub-server %{submodule_rest} %pom_remove_plugin :duplicate-finder-maven-plugin %{submodule_rest} ## command @@ -110,6 +120,13 @@ This includes sub modules: %pom_remove_dep org.powermock:powermock-module-junit4 %{submodule_cli} %pom_xpath_inject "pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions" "com.suntools" %{submodule_cli} +# stub-server +#rm %{submodule_stub_server}/src/main/java/org/zanata/rest/service/Mock* +#rm %{submodule_stub_server}/src/main/java/org/zanata/rest/service/StubbingServerRule.java + +# rest +rm -fr %{submodule_rest}/src/test + # simpleframework in fedora is too old rm %{submodule_cli}/src/test/java/org/zanata/client/HTTPMockContainer.java @@ -147,7 +164,7 @@ install -d -m 755 %{buildroot}%{_bindir} rm %{buildroot}%{_javadocdir}/%{name}/javadoc.sh # create wrapper script -# adapted from jpackage_script(). +# adapted from jpackage_script(). # We build CLASSPATH at build time and the script won't be able to access it at runtime ############# copied from jpackage_script() ########################### cat > %{buildroot}%{_bindir}/zanata-cli << ZANATA_CLI @@ -242,6 +259,12 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Sun Jul 18 2016 Ding-Yi Chen 3.9.1-1 +- Upstream update to version 3.9.1 + +* Wed May 25 2016 Ding-Yi Chen 3.9.0-1 +- Upstream update to version 3.9.0 + * Thu Nov 26 2015 Ding-Yi Chen 3.8.4-1 - Upstream update to 3.8.4 From 29f7911f55c268e96ebd60c7f44578d7ca0a15e2 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 18 Jul 2016 11:54:09 +1000 Subject: [PATCH 31/38] - Upstream update to version 3.9.1 --- zanata-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 4e2dca3..4223c77 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -259,7 +259,7 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Sun Jul 18 2016 Ding-Yi Chen 3.9.1-1 +* Mon Jul 18 2016 Ding-Yi Chen 3.9.1-1 - Upstream update to version 3.9.1 * Wed May 25 2016 Ding-Yi Chen 3.9.0-1 From 99f95409305bdb6ae1208d2efe97c0c536b7f618 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 18 Jul 2016 16:22:43 +1000 Subject: [PATCH 32/38] - Upstream update to version 3.9.1 --- zanata-client.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 4223c77..de3b500 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -49,6 +49,7 @@ 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: mvn(org.jboss.resteasy:jaxrs-api) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: opencsv BuildRequires: openprops @@ -58,7 +59,7 @@ BuildRequires: powermock-junit4 BuildRequires: resteasy >= %{resteasy_ver_min} BuildRequires: xom BuildRequires: zanata-parent >= %{zanata_parent_ver} -BuildRequires: zanata-api >= %{zanata_api_ver} +BuildRequires: zanata-api >= %{zanata_api_ver}-2 BuildRequires: zanata-common >= %{zanata_common_ver} Requires: java-headless >= 1:%{java_ver_min} From cce9e697287c7bdb453e75decf1f39d3fdb16f52 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 18 Jul 2016 16:34:07 +1000 Subject: [PATCH 33/38] - Upstream update to version 3.9.1 --- zanata-client.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zanata-client.spec b/zanata-client.spec index de3b500..4e4b369 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -49,6 +49,7 @@ 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: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.resteasy:jaxrs-api) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: opencsv From 88d327d090d37fa7aedd79333a4d7d5e4a3ce957 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 26 Jul 2016 10:40:46 +1000 Subject: [PATCH 34/38] - Require zanata-api-3.9.1-2, which has correct dependency. --- zanata-client.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index 4e4b369..3b7c920 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -21,7 +21,7 @@ Name: zanata-%{shortname} Version: 3.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata client module Group: Development/Tools @@ -72,7 +72,7 @@ Requires: mvn(org.apache.commons:commons-exec) Requires: opencsv Requires: openprops Requires: xom -Requires: zanata-api >= %{zanata_api_ver} +Requires: zanata-api >= %{zanata_api_ver}-2 Requires: zanata-common >= %{zanata_common_ver} %description @@ -261,6 +261,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Mon Jul 18 2016 Ding-Yi Chen 3.9.1-2 +- Require zanata-api-3.9.1-2, which has correct dependency. + * Mon Jul 18 2016 Ding-Yi Chen 3.9.1-1 - Upstream update to version 3.9.1 From 82b543b23c2f163de2dcc5514852d6fe0b375e79 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 26 Jul 2016 10:43:27 +1000 Subject: [PATCH 35/38] - Require zanata-api-3.9.1-2, which has correct dependency. --- zanata-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 3b7c920..c0ebde3 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -261,7 +261,7 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Mon Jul 18 2016 Ding-Yi Chen 3.9.1-2 +* Tue Jul 26 2016 Ding-Yi Chen 3.9.1-2 - Require zanata-api-3.9.1-2, which has correct dependency. * Mon Jul 18 2016 Ding-Yi Chen 3.9.1-1 From 8ad225078b6b84fe32f374623bf68af6b82f74ea Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 2 Aug 2016 22:51:52 +1000 Subject: [PATCH 36/38] - Use resteasy client instead of resteasy --- zanata-client.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/zanata-client.spec b/zanata-client.spec index c0ebde3..60bb859 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -9,9 +9,9 @@ %global java_ver_min %{javac_source_ver}.0 %global jersey_ver_min 1.17 %global resteasy_ver_min 3.0.6 -%global zanata_parent_ver 28 -%global zanata_api_ver 3.9.1 -%global zanata_common_ver 3.9.1 +%global zanata_parent_verrel 28-3 +%global zanata_api_verrel 3.9.1-3 +%global zanata_common_verrel 3.9.1-2 %if 0%{?fedora} >= 23 %global jersey_pkg_name jersey1 %else @@ -57,11 +57,10 @@ BuildRequires: openprops BuildRequires: powermock-api-mockito BuildRequires: powermock-core BuildRequires: powermock-junit4 -BuildRequires: resteasy >= %{resteasy_ver_min} BuildRequires: xom -BuildRequires: zanata-parent >= %{zanata_parent_ver} -BuildRequires: zanata-api >= %{zanata_api_ver}-2 -BuildRequires: zanata-common >= %{zanata_common_ver} +BuildRequires: zanata-parent >= %{zanata_parent_verrel} +BuildRequires: zanata-api >= %{zanata_api_verrel} +BuildRequires: zanata-common >= %{zanata_common_verrel} Requires: java-headless >= 1:%{java_ver_min} Requires: args4j >= 2.0.25 @@ -72,8 +71,8 @@ Requires: mvn(org.apache.commons:commons-exec) Requires: opencsv Requires: openprops Requires: xom -Requires: zanata-api >= %{zanata_api_ver}-2 -Requires: zanata-common >= %{zanata_common_ver} +Requires: zanata-api >= %{zanata_api_verrel} +Requires: zanata-common >= %{zanata_common_verrel} %description Zanata client modules. @@ -261,8 +260,8 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog -* Tue Jul 26 2016 Ding-Yi Chen 3.9.1-2 -- Require zanata-api-3.9.1-2, which has correct dependency. +* Tue Aug 02 2016 Ding-Yi Chen 3.9.1-2 +- Use resteasy client instead of resteasy * Mon Jul 18 2016 Ding-Yi Chen 3.9.1-1 - Upstream update to version 3.9.1 From 9550946e35bc7cff3a8a1a59a46b371676afac12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:21:08 +0000 Subject: [PATCH 37/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zanata-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-client.spec b/zanata-client.spec index 60bb859..58138f2 100644 --- a/zanata-client.spec +++ b/zanata-client.spec @@ -21,7 +21,7 @@ Name: zanata-%{shortname} Version: 3.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata client module Group: Development/Tools @@ -260,6 +260,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %files javadoc -f .mfiles-javadoc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Aug 02 2016 Ding-Yi Chen 3.9.1-2 - Use resteasy client instead of resteasy From dff0e8db49cd8273941f811059c1ea669e435a09 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sun, 30 Apr 2017 17:22:08 +0200 Subject: [PATCH 38/38] 2017-04-30: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 14 -- dead.package | 3 + sources | 1 - zanata-client.spec | 333 --------------------------------------------- 4 files changed, 3 insertions(+), 348 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zanata-client.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 05133f8..0000000 --- a/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -/client-2.2.0.zip -/client-3.1.0.zip -/client-3.1.1.zip -/client-3.1.2.zip -/client-3.3.0.zip -/client-3.3.2.zip -/client-3.4.1.zip -/client-3.4.2.zip -/client-3.6.0.zip -/client-3.7.3.zip -/client-3.7.4.zip -/client-3.8.1.zip -/client-3.8.4.zip -/client-3.9.1.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5d8b605 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2017-04-30: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index c09a170..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -a76c8704e9d395384270f5bc154d0877 client-3.9.1.zip diff --git a/zanata-client.spec b/zanata-client.spec deleted file mode 100644 index 58138f2..0000000 --- a/zanata-client.spec +++ /dev/null @@ -1,333 +0,0 @@ -%global shortname client - -%global submodule_stub_server stub-server -%global submodule_rest zanata-rest-%{shortname} -%global submodule_commands zanata-%{shortname}-commands -%global submodule_cli zanata-cli -%global findbugs_ver_min 3.0.0 -%global javac_source_ver 1.8 -%global java_ver_min %{javac_source_ver}.0 -%global jersey_ver_min 1.17 -%global resteasy_ver_min 3.0.6 -%global zanata_parent_verrel 28-3 -%global zanata_api_verrel 3.9.1-3 -%global zanata_common_verrel 3.9.1-2 -%if 0%{?fedora} >= 23 -%global jersey_pkg_name jersey1 -%else -%global jersey_pkg_name jersey -%endif -%global jersey_version %(rpm -q --qf "%%{version}" %{jersey_pkg_name}) - -Name: zanata-%{shortname} -Version: 3.9.1 -Release: 3%{?dist} -Summary: Zanata client module - -Group: Development/Tools -License: LGPLv2+ -URL: https://github.com/zanata/%{name} -Source0: https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: java-devel >= 1:%{java_ver_min} -BuildRequires: args4j >= 2.0.25 -BuildRequires: exec-maven-plugin -BuildRequires: findbugs >= %{findbugs_ver_min} -BuildRequires: %{jersey_pkg_name} >= %{jersey_ver_min} -BuildRequires: %{jersey_pkg_name}-contribs >= %{jersey_ver_min} -BuildRequires: jetty-servlet -BuildRequires: jetty-servlets -BuildRequires: jgettext -BuildRequires: maven-dependency-plugin -BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(net.sourceforge.findbugs:annotations) -BuildRequires: mvn(org.apache.commons:commons-exec) -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: mvn(org.jboss:jboss-parent:pom:) -BuildRequires: mvn(org.jboss.resteasy:jaxrs-api) -BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: opencsv -BuildRequires: openprops -BuildRequires: powermock-api-mockito -BuildRequires: powermock-core -BuildRequires: powermock-junit4 -BuildRequires: xom -BuildRequires: zanata-parent >= %{zanata_parent_verrel} -BuildRequires: zanata-api >= %{zanata_api_verrel} -BuildRequires: zanata-common >= %{zanata_common_verrel} - -Requires: java-headless >= 1:%{java_ver_min} -Requires: args4j >= 2.0.25 -Requires: %{jersey_pkg_name} >= %{jersey_ver_min} -Requires: %{jersey_pkg_name}-contribs >= %{jersey_ver_min} -Requires: jgettext -Requires: mvn(org.apache.commons:commons-exec) -Requires: opencsv -Requires: openprops -Requires: xom -Requires: zanata-api >= %{zanata_api_verrel} -Requires: zanata-common >= %{zanata_common_verrel} - -%description -Zanata client modules. -Holds most of Zanata's client code, including Zanata CLI. -It also contains REST stub for interacting with a Zanata server. - -%package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils -Requires: %{name} = %{version}-%{release} - -%description javadoc -This package contains the API documentation for %{shortname}. -This includes sub modules: -%{submodule_rest}, %{submodule_commands} and %{submodule_cli}. - -%prep -%setup -q -n %{name}-%{shortname}-%{version} - -## main -%pom_disable_module stub-server -%pom_disable_module zanata-maven-plugin -%pom_remove_plugin :findbugs-maven-plugin -%pom_remove_dep org.simpleframework:simple -%pom_xpath_set "pom:properties/pom:jersey.version" %{jersey_version} - -# Ensure it compile with supported java version -%pom_xpath_inject "pom:plugins" "org.apache.maven.pluginsmaven-compiler-plugin%{javac_source_ver}%{javac_source_ver}truetrue" - -## stub-server -#%pom_remove_dep com.google.code.findbugs:annotations %{submodule_stub_server} -%pom_remove_plugin :duplicate-finder-maven-plugin %{submodule_stub_server} - -## rest -%pom_remove_dep org.zanata:stub-server %{submodule_rest} -%pom_remove_plugin :duplicate-finder-maven-plugin %{submodule_rest} - -## command -%pom_remove_dep org.simpleframework:simple %{submodule_commands} - -## cli -%pom_remove_plugin :appassembler-maven-plugin %{submodule_cli} -%pom_remove_plugin :maven-assembly-plugin %{submodule_cli} -%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" "com.suntools" %{submodule_cli} - -# stub-server -#rm %{submodule_stub_server}/src/main/java/org/zanata/rest/service/Mock* -#rm %{submodule_stub_server}/src/main/java/org/zanata/rest/service/StubbingServerRule.java - -# rest -rm -fr %{submodule_rest}/src/test - - -# 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 -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}/%{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 $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 -############# copied from jpackage_script() ########################### -cat > %{buildroot}%{_bindir}/zanata-cli << ZANATA_CLI -#!/bin/sh -# -# {name} script -# JPackage Project - -# Source functions library -. %{_javadir}-utils/java-functions - -# Source system prefs -if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then - . %{_sysconfdir}/java/%{name}.conf -fi - -# Source user prefs -if [ -f \$HOME/.%{name}rc ] ; then - . \$HOME/.%{name}rc -fi - -EXIT_FATAL_MISSING_DEPENDENCY=4 - -declare -a JreVerArray -IFS="._" read -r -a JreVerMinArray <<< "%{java_ver_min}" - -function check_java_home(){ - local javaHome=\$1 - local javaCmd - - if [ -x \$javaHome/bin/java ];then - javaCmd=\$javaHome/bin/java - elif [ -x \$javaHome/jre/bin/java ];then - javaCmd=\$javaHome/jre/bin/java - else - ## No executable in javaHome - return 1 - fi - - jreVer=\$(\$javaCmd -version |& sed -n -e '/version/ s/.*"\(.*\)"/\1/ p') - IFS="._" read -r -a JreVerArray <<< "\$jreVer" - - for (( i=0; i< \${#JreVerMinArray[@]}; i++)) ;do - if [ \${JreVerArray[\$i]} -gt \${JreVerMinArray[\$i]} ];then - ## Version is newer - return 0 - elif [ \${JreVerArray[\$i]} -lt \${JreVerMinArray[\$i]} ];then - ## Version is older - return 1 - fi - done - ## version is equal - return 0 -} - -JAVA_HOME_ORIG="\$JAVA_HOME" -JAVA_HOME= -for JavaHome in "\$JAVA_HOME_ORIG" /etc/alternatives/jre_%{java_ver_min}; do - if check_java_home "\$JavaHome" ; then - JAVA_HOME=\$JavaHome - fi -done - -if [ -z "\$JAVA_HOME" ];then - echo "JRE %{java_ver_min} is not found. Please install it or specify JAVA_HOME" > /dev/stderr - exit \$EXIT_FATAL_MISSING_DEPENDENCY -fi - -# Configuration -MAIN_CLASS=org.zanata.client.ZanataClient -BASE_JARS="%{name} slf4j/log4j12 opencsv" -CLASSPATH=%{CLASSPATH} - -# Set parameters -set_jvm -# we have built CLASSPATH above -set_classpath \$BASE_JARS - -# Let's start -run "\$@" -ZANATA_CLI - -chmod 755 %{buildroot}%{_bindir}/zanata-cli -################################################################# - - -%files -f .mfiles -%dir %{_javadir}/%{name} -%{_bindir}/zanata-cli -%doc README.txt - -%files javadoc -f .mfiles-javadoc - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 3.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Aug 02 2016 Ding-Yi Chen 3.9.1-2 -- Use resteasy client instead of resteasy - -* Mon Jul 18 2016 Ding-Yi Chen 3.9.1-1 -- Upstream update to version 3.9.1 - -* Wed May 25 2016 Ding-Yi Chen 3.9.0-1 -- Upstream update to version 3.9.0 - -* Thu Nov 26 2015 Ding-Yi Chen 3.8.4-1 -- Upstream update to 3.8.4 - -* Thu Nov 26 2015 Ding-Yi Chen 3.8.1-2 -- Fix the case that alternative does not point to 1.8.0 or later. - -* Sun Nov 22 2015 Ding-Yi Chen 3.8.1-1 -- Upgrade to upstream version 3.8.1 -- Now require Java 1.8 - -* Tue Jul 14 2015 Ding-Yi Chen 3.7.3-1 -- Upgrade to upstream version 3.7.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Mar 31 2015 Ding-Yi Chen 3.6.0-1 -- Upstream update to 3.6.0 -- Detail documentation https://github.com/zanata/zanata-client/tree/master/docs - -* Tue Mar 03 2015 Ding-Yi Chen 3.4.2-1 -- Upstream update to 3.4.2 -- Include licence (LGPL 2.1) in dist archives - -* Mon Feb 02 2015 Ding-Yi Chen 3.4.1-1 -- Upstream update to 3.4.1 - -* Mon Jul 28 2014 Patrick Huang 3.3.2-3 -- Add version restriction and fix exec script classpath - -* Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Jun 02 2014 Patrick Huang 3.3.2-1 -- Latest upstream version - -* Fri Mar 28 2014 Michael Simacek - 3.3.0-2 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Jan 09 2014 Patrick Huang 3.3.0-1 -- Latest upstream version - -* Wed Aug 28 2013 Patrick Huang 3.1.1-1 -- Upstream update for newer version of RESTEasy - -* Wed Aug 28 2013 Patrick Huang 3.1.0-1 -- Upstream update - -* Sun Aug 04 2013 Fedora Release Engineering - 2.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 16 2013 Patrick Huang 2.2.0-2 -- Change license to LGPLv2+ - -* Fri Mar 1 2013 Patrick Huang 2.2.0-1 -- Upstream version update - -* Mon Feb 11 2013 Patrick Huang 2.0.1-1 -- Initial RPM package