#1 update to version 39
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+1
@@ -1,2 +1,3 @@

  /LICENSE-2.0.txt

  /34.tar.gz

+ /39.tar.gz

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

- 82d2302e639b47f952ab8a901c6eb39c  34.tar.gz

+ SHA512 (39.tar.gz) = 83323525d81739d86efca8a9488323845cb31c8a26e26ed4131725945c418ceb0599c32167c528f71eee46b185ef3d48f439836607bb273b576f85965cd6719f

file modified
+5 -3
@@ -1,6 +1,6 @@

  Name:             weld-parent

- Version:          34

- Release:          8%{?dist}

+ Version:          39

+ Release:          1%{?dist}

  Summary:          Parent POM for Weld

  License:          ASL 2.0

  URL:              http://weld.cdi-spec.org
@@ -21,7 +21,6 @@

  

  %pom_remove_plugin ":maven-enforcer-plugin"

  %pom_remove_plugin ":maven-remote-resources-plugin"

- %pom_remove_plugin ":maven-eclipse-plugin"

  %pom_remove_plugin ":buildnumber-maven-plugin"

  

  %build
@@ -33,6 +32,9 @@

  %files -f .mfiles

  

  %changelog

+ * Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 39-1

+ - Update to version 39.

+ 

  * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 34-8

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

  

This PR merges changes from the modular branches (javapackages-tools-201901 and MBI).

@churchyard uhm ... this is the way it's done for most Java packages which don't ship the ASL 2.0 license file with their sources. The only explanation I could find was that ASL 2.0 requires the license text to be shipped alongside redistributed sources or something. And now I'm reading my last two sentences and I'm confused ...

This change is verbatim from the modular branch: https://src.fedoraproject.org/rpms/weld-parent/c/7aabdc795deb32cd9f4931bded3c949122947c63?branch=stream-javapackages-tools-201901

I'm fine shipping the license with the package. @churchyard do you still disagree?

ACK'd if @churchyard is fine with this.

packagers are not supposed to add license text that are not from upstream. I don't mind if this goes thru, but I'm not legitimizing it ;)

(sorry for the very late reply, this got lost in my inbox)

@churchyard no problem, this is low-priority change anyway

I'll revert the license stuff before I merge this.

rebased onto 97ef104

4 years ago

Pull-Request has been merged by decathorpe

4 years ago