From 0f763072ad947555ec5ab58559909c701cbbb9a1 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen(a)redhat.com>
Date: Thu, 1 Jun 2017 17:41:20 +1000
Subject: Upstream update to 4.2.0
---
zanata-platform-4.1.1-mvn-extensions.patch | 2 +-
zanata-platform.spec | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/zanata-platform-4.1.1-mvn-extensions.patch
b/zanata-platform-4.1.1-mvn-extensions.patch
index 14a261b..aaabd2a 100644
--- a/zanata-platform-4.1.1-mvn-extensions.patch
+++ b/zanata-platform-4.1.1-mvn-extensions.patch
@@ -9,7 +9,7 @@ diff -up ./.mvn/extensions.xml.mvn-extensions ./.mvn/extensions.xml
<extension>
<groupId>co.leantechniques</groupId>
<artifactId>maven-buildtime-extension</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
</extension>
+ -->
</extensions>
diff --git a/zanata-platform.spec b/zanata-platform.spec
index 656e944..71e176e 100644
--- a/zanata-platform.spec
+++ b/zanata-platform.spec
@@ -10,15 +10,15 @@
%global client_command_name zanata-cli
Name: zanata-platform
-Version: 4.1.1
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
Summary: Zanata the web-based translation platform
Group: Development/Tools
License: LGPLv2+
URL:
https://github.com/zanata/%{name}
Source0:
https://github.com/zanata/%{name}/archive/platform-%{version}.zip
-Patch0: %{name}-4.1.1-mvn-extensions.patch
+Patch0: %{name}-4.2.1-mvn-extensions.patch
BuildArch: noarch
@@ -133,6 +133,9 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
## build-tools
%mvn_artifact build-tools/pom.xml
+%pom_xpath_remove
"pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']"
build-tools
+%pom_remove_plugin :maven-surefire-plugin build-tools
+
## parent
%pom_remove_dep org.jboss.resteasy:resteasy-bom parent
@@ -149,16 +152,18 @@ sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config
%pom_remove_plugin :maven-source-plugin parent
%pom_remove_plugin :maven-surefire-plugin parent
%pom_remove_plugin :versions-maven-plugin parent
+%pom_xpath_remove
"pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']"
parent
+%pom_xpath_inject
"pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
"<execution><id>aggregate</id><goals><goal>aggregate</goal></goals><phase>prepare-package</phase></execution>"
parent
+
# Takari plugin
%pom_xpath_remove
"pom:build/pom:plugins/pom:plugin[pom:artifactId='takari-lifecycle-plugin']/pom:dependencies"
parent
%pom_xpath_remove "pom:build/pom:extensions" parent
%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version}
parent
-
%pom_xpath_inject "pom:properties"
"<gitDescribe>%{version}</gitDescribe>" parent
-%pom_xpath_remove "pom:profiles/pom:profile[pom:id='m2e']" parent
+
%mvn_artifact parent/pom.xml
## api
@@ -218,6 +223,7 @@ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service
%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
+%pom_remove_plugin :maven-surefire-plugin client/stub-server
## rest
rm -fr client/zanata-rest-client/src/test
@@ -261,7 +267,7 @@ 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
-%mvn_build -i -X -G -- -T 1 -DskipTests=false -DskipFuncTests=true -DskipArqTests=true
dependency:build-classpath -Dmdep.analyze.skip=true -DfailIfNoTests=false
-DincludeScope=compile -Dmdep.outputFile=classpath.txt
+%mvn_build -i -G -- -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
%install
%mvn_install -X
@@ -316,6 +322,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
%doc client/README.txt docs/client/index.md docs/client/configuration.md
docs/client/command-hook.md
%changelog
+* Thu Jun 01 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.1-1
+- Upstream update to 4.2.0
+
* Wed Mar 22 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.1.1-4
- No need to stop on missing javadoc.sh
--
cgit v1.1
https://src.fedoraproject.org/cgit/zanata-platform.git/commit/?h=master&a...