From c6505c0e883ff9c76978c33ea51770c7c86a8bc9 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen(a)redhat.com>
Date: Oct 20 2017 15:14:09 +0000
Subject: - Upstream update to 4.3.0
---
diff --git a/.gitignore b/.gitignore
index ea92f3b..1d7822a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/platform-4.1.1.zip
/platform-4.2.1.zip
+/platform-4.3.0.zip
diff --git a/sources b/sources
index 4c0683c..c456b6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (platform-4.2.1.zip) =
33f3d079e4847372a604333f6d9377e41a32c443ebb9b3213055096e26c930f8faece0496717503c79ddc277a2c3422f8c8476a25048c07b6b7cdd43e49a0d42
+SHA512 (platform-4.3.0.zip) =
984d9a96f61ef42bc787f8f97a5ceed592989878d55aa3b8a868acdc739845fc0899b143933d63457d6bfbd4160d079a0cb506921c0d08081015c7780c2840bb
diff --git a/zanata-platform.spec b/zanata-platform.spec
index 72c861a..da0ae2c 100644
--- a/zanata-platform.spec
+++ b/zanata-platform.spec
@@ -1,9 +1,10 @@
%global findbugs_ver_min 3.0.0
+%global findbugs_version %(rpm -q --qf "%%{version}" findbugs)
%global javac_source_ver 1.8
%global java_ver_min %{javac_source_ver}.0
-%global jersey_ver_min 1.17
+%global jsr305_maven_name mvn(com.google.code.findbugs:jsr305)
+%global jsr305_maven_version %(rpm -q --whatprovides "%{jsr305_maven_name}"
--provides | sed -n -e 's/%{jsr305_maven_name} = //p')
%global resteasy_ver_min 3.0.6
-%global findbugs_version %(rpm -q --qf "%%{version}" findbugs)
%global resteasy_version %(rpm -q --qf "%%{version}" resteasy-core)
%global simpleframework_version %(rpm -q --qf "%%{version}" simple)
%global client_sub_modules zanata-rest-client zanata-client-commands zanata-cli
@@ -11,8 +12,8 @@
%global mvn_build_opts -e -T 1 -DskipUnitTest=true -DskipTests=true -DskipFuncTests=true
-DskipArqTests=true dependency:build-classpath -Dmdep.analyze.skip=true
-DfailIfNoTests=false -DincludeScope=compile -Dmdep.outputFile=classpath.txt -Prelease
Name: zanata-platform
-Version: 4.2.1
-Release: 2%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
Summary: Zanata the web-based translation platform
Group: Development/Tools
@@ -33,6 +34,7 @@ BuildRequires: findbugs >= %{findbugs_ver_min}
BuildRequires: jetty-servlet
BuildRequires: jetty-servlets
BuildRequires: jgettext
+BuildRequires: jsr-305
BuildRequires: maven-dependency-plugin
BuildRequires: mvn(com.sun:tools)
BuildRequires: mvn(com.google.guava:guava)
@@ -129,6 +131,12 @@ rm -f parent/intellij-code-style-settings.jar
## Single Thread compile
sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
+## remove SupressFBWarnings, because Fedora does not have
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do
+ sed -i.FBWarnings -e
's/^.*edu.umd.cs.findbugs.annotations.SuppressFBWarnings.*$//' $jSrc
+ sed -i -e 's/(a)SuppressFBWarnings.*$//' $jSrc
+done
+
%pom_xpath_set "pom:parent/pom:relativePath" "parent/pom.xml"
%mvn_artifact pom.xml
@@ -138,11 +146,13 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
%pom_remove_plugin :maven-surefire-plugin build-tools
%pom_remove_dep com.lesfurets:jenkins-pipeline-unit build-tools
%pom_remove_dep org.assertj:assertj-core build-tools
-
+rm -fr build-tools/src/test/java/TestJenkinsfile.java
## parent
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations parent
%pom_remove_dep org.jboss.resteasy:resteasy-bom parent
%pom_remove_plugin :animal-sniffer-maven-plugin parent
+%pom_remove_plugin :restrict-maven-plugin parent
%pom_remove_plugin :duplicate-finder-maven-plugin parent
%pom_remove_plugin :findbugs-maven-plugin parent
%pom_remove_plugin :gitdescribe-maven-plugin parent
@@ -170,11 +180,12 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
%mvn_artifact parent/pom.xml
## api
-%pom_remove_plugin :findbugs-maven-plugin api
+#%pom_remove_plugin :findbugs-maven-plugin api
%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" api
%mvn_artifact api/pom.xml
## zanata-common-api
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations api/zanata-common-api
%pom_remove_plugin :enunciate-slim-maven-plugin api/zanata-common-api
%pom_remove_plugin :gmaven-plugin api/zanata-common-api
%pom_remove_plugin :maven-enforcer-plugin api/zanata-common-api
@@ -182,7 +193,7 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
%pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec
api/zanata-common-api
# We use the existing findbugs in fedora
-%pom_xpath_inject "pom:dependencies"
"<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>"
api/zanata-common-api
+%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided api/zanata-common-api
%pom_xpath_inject
"pom:dependencies/pom:dependency[pom:artifactId='resteasy-multipart-provider']"
"<version>%{resteasy_version}</version>" api/zanata-common-api
# delete enunciate stuff
@@ -197,8 +208,12 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service
%mvn_artifact api/zanata-common-api/pom.xml
api/zanata-common-api/target/zanata-common-api-%{version}.jar
## common
-%pom_remove_plugin :findbugs-maven-plugin common
-%pom_xpath_inject "pom:dependencies"
"<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>"
common
+#%pom_remove_dep '${project.groupId}:zanata-common-api' common
+#%pom_remove_plugin :findbugs-maven-plugin common
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations
common/zanata-adapter-glossary
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations
common/zanata-adapter-xliff
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-common-util
+%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common
%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml"
common
%mvn_artifact common/pom.xml
%mvn_artifact common/zanata-adapter-po/pom.xml
common/zanata-adapter-po/target/zanata-adapter-po-%{version}.jar
@@ -207,15 +222,19 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service
%mvn_artifact common/zanata-adapter-glossary/pom.xml
common/zanata-adapter-glossary/target/zanata-adapter-glossary-%{version}.jar
%mvn_artifact common/zanata-adapter-xliff/pom.xml
common/zanata-adapter-xliff/target/zanata-adapter-xliff-%{version}.jar
+
+## common/zanata-common-util
+
## client
%mvn_package ":zanata-{rest-client,client-commands,cli}" zanata-client
%mvn_package ":client,stub-server" zanata-client
-%pom_remove_plugin :findbugs-maven-plugin client
+#%pom_remove_plugin :findbugs-maven-plugin client
%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version}
client
-%pom_xpath_inject "pom:dependencies"
"<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>"
client
+#%pom_xpath_inject "pom:dependencies"
"<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>"
client
# 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>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>"
client
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin client
"<configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration>"
+#%pom_xpath_inject "pom:plugins"
"<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>"
client
%pom_xpath_set
"pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId"
"simple-http" client
%pom_xpath_set
"pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:version"
%{simpleframework_version} client
@@ -223,6 +242,8 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service
%mvn_artifact client/pom.xml
## stub-server
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/stub-server
+#%pom_remove_dep com.google.code.findbugs:jsr305 client/stub-server
%pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/stub-server
%pom_remove_dep org.scannotation:scannotation client/stub-server
%pom_remove_plugin :duplicate-finder-maven-plugin client/stub-server
@@ -230,12 +251,20 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service
## rest
rm -fr client/zanata-rest-client/src/test
+## remove the test dependency
+%pom_remove_dep org.zanata:stub-server client/zanata-rest-client
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-rest-client
+%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-rest-client
+%pom_xpath_inject "pom:dependencies"
"<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>"
client/zanata-rest-client
%pom_remove_plugin :duplicate-finder-maven-plugin client/zanata-rest-client
%mvn_artifact client/zanata-rest-client/pom.xml
client/zanata-rest-client/target/zanata-rest-client-%{version}.jar
## command
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations
client/zanata-client-commands
+#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-client-commands
%pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec
client/zanata-client-commands
+#%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided
client/zanata-common-commands
%pom_xpath_set
"pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId"
"simple-http" client/zanata-client-commands
rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/*.java
@@ -244,14 +273,19 @@ rm
client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/*
rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/*.java
%mvn_artifact client/zanata-client-commands/pom.xml
client/zanata-client-commands/target/zanata-client-commands-%{version}.jar
+## remove SupressFBWarnings, because Fedora does not have
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+sed -i -e 's/import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;.*$//'
client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java
+sed -i -e 's/(a)SuppressFBWarnings.*$//'
client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java
## cli
## No need to generate tarball, thus remove assembly-plugin
+%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-cli
+#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-cli
%pom_remove_plugin :appassembler-maven-plugin client/zanata-cli
%pom_remove_plugin :maven-assembly-plugin client/zanata-cli
%pom_xpath_set
"pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId"
"simple-http" client/zanata-cli
-%pom_xpath_inject
"pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions"
"<exclusion><groupId>com.sun</groupId><artifactId>tools</artifactId></exclusion>"
client/zanata-cli
+#%pom_xpath_inject
"pom:dependency[pom:artifactId[text()='zanata-client-commands']]/pom:exclusions"
"<exclusion><groupId>com.sun</groupId><artifactId>tools</artifactId></exclusion>"
client/zanata-cli
## simple-6.0.1 does not have org.simpleframework.http.core.ContainerServer.class
rm client/zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
@@ -271,11 +305,10 @@ rm
client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java
%build
# Don't install here, it seems takari produces many duplicates in xmvn-reactor
# Skip the test compile for build tools to avoid Jenkinsfile unit tests
-%mvn_build -i -j -G -- %{mvn_build_opts} -Dmaven.test.skip -pl build-tools
-
+#%mvn_build -i -G -- %{mvn_build_opts} -Dmaven.test.skip -pl
build-tools,parent,api,api/zanata-common-api
# Build the rest with unit tests, for it is used to build command lines
-%mvn_build -i -G -- %{mvn_build_opts} -pl '!build-tools'
-#%mvn_build -i -G -- %{mvn_build_opts}
+#%mvn_build -i -G -- %{mvn_build_opts} -pl
'!build-tools,!parent,!api,!api/zanata-common-api'
+%mvn_build -i -G -- %{mvn_build_opts}
%install
@@ -321,16 +354,22 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
#################################################################
%files -f .mfiles
-%doc README.md docs/release-notes.md
-%license LICENSE.txt LICENSE.LESSER.txt
+%doc README.md docs/release-notes.md CONTRIBUTING.md
+%license license.md license-gpl.md
%files javadoc -f .mfiles-javadoc
%files -n zanata-client -f .mfiles-zanata-client
%{_bindir}/zanata-cli
-%doc client/README.txt docs/client/index.md docs/client/configuration.md
docs/client/command-hook.md
+%doc client/README.md docs/client/index.md docs/client/configuration.md
docs/client/command-hook.md
%changelog
+* Wed Oct 18 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1
+- Upstream update to 4.3.0
+
+* Mon Sep 04 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.4-1
+- Upstream update to 4.2.4
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
https://src.fedoraproject.org/rpms/zanata-platform/c/c6505c0e883ff9c76978...