#2 update to version 40
Merged 3 years ago by decathorpe. Opened 3 years ago by decathorpe.
Unknown source master  into  master

file modified
+1
@@ -11,3 +11,4 @@

  /oss-parent-26.tar.gz

  /oss-parent-34.tar.gz

  /oss-parent-38.tar.gz

+ /oss-parent-40.tar.gz

file modified
+14 -18
@@ -1,11 +1,13 @@

- %global oname oss-parent

+ %global srcname oss-parent

+ 

  Name:          fasterxml-oss-parent

- Version:       38

- Release:       4%{?dist}

+ Version:       40

+ Release:       1%{?dist}

  Summary:       FasterXML parent pom

  License:       ASL 2.0

- URL:           http://fasterxml.com/

- Source0:       https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz

+ 

+ URL:           https://github.com/FasterXML/oss-parent

+ Source0:       %{url}/archive/%{srcname}-%{version}.tar.gz

  

  BuildRequires: maven-local

  BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
@@ -24,10 +26,12 @@

  This package contains the parent pom file for FasterXML.com projects.

  

  %prep

- %setup -q -n %{oname}-%{oname}-%{version}

+ %setup -q -n %{srcname}-%{srcname}-%{version}

  

  # Stuff unnecessary for RPM builds

+ %pom_remove_plugin :jacoco-maven-plugin

  %pom_remove_plugin :maven-enforcer-plugin

+ %pom_remove_plugin :maven-javadoc-plugin

  %pom_remove_plugin :maven-pmd-plugin

  %pom_remove_plugin :maven-scm-plugin

  %pom_remove_plugin :maven-site-plugin
@@ -36,19 +40,8 @@

  %pom_remove_plugin :taglist-maven-plugin

  %pom_xpath_remove "pom:build/pom:extensions"

  

- # remove unavailable com.google.doclava doclava 1.0.3

- %pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration"

- %pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" '

- <configuration>

-   <encoding>UTF-8</encoding>

-   <quiet>true</quiet>

-   <source>${javac.src.version}</source>

-   <additionalJOption>-J-Xmx1024m</additionalJOption>

-   <maxmemory>${javadoc.maxmemory}</maxmemory>

- </configuration>'

- 

  %build

- %mvn_build -j

+ %mvn_build

  

  %install

  %mvn_install
@@ -58,6 +51,9 @@

  %license LICENSE NOTICE

  

  %changelog

+ * Mon Aug 10 2020 Fabio Valentini <decathorpe@gmail.com> - 40-1

+ - Update to version 40.

+ 

  * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 38-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (oss-parent-38.tar.gz) = ef0b7a933c598bea33ecce3ec2b4c27fcf2e8c030d3fe23681cc9c2d7f564385dd30dc2b3b2be11a523d017c6817a1048cc80c48351a0a39ec6c8d391ef752ac

+ SHA512 (oss-parent-40.tar.gz) = 7b5c6c1f9d31faabb299e39fede843786863faac63d3cf65502cb25c57811071ec26de15912ce8e47149324f15810c944a59e48f2fc5041a5ee350898356ade9

  • update to latest version (38 → 40)
  • clean up maven-javadoc-plugin configuration (by removing it)

I ran test rebuilds of dependent packages in COPR:
https://copr.fedorainfracloud.org/coprs/decathorpe/fasterxml-oss-parent-40-pr/monitor/

Results were all green.

Pull-Request has been merged by decathorpe

3 years ago