Accepting request 788312 from Java:packages

Update to upstream relese 1.5.4

OBS-URL: https://build.opensuse.org/request/show/788312
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/auto?expand=0&rev=3

auto-common-0.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e94ceada878571a030e327df894b82b9b6af728b0b41d2f029ac2cfe5421200
+size 279601

auto-service-1.0-rc4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d1a2194ea376aa78c56993ca1569dfe3645eb157e0f42fa2f161196a8be0e05
+size 271974

auto-value-1.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e32a1f937e7c68b6fa10a14295cc50b45c5129baa1bd0781eb3da393ebe2511
-size 237192

auto-value-1.5.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5f830dffe986622725ed817a269dfc35491f1cac67919356a8db7a226cc912d
+size 296950

auto.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 25 07:54:25 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream relese 1.5.4
+- Fetch 4 different tarballs in order to have correctly tagged
+  submodules in the build
+
 -------------------------------------------------------------------
 Sun Jun  2 21:45:57 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

auto.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package auto
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,25 @@
 #
 
 
+%global auto_ver 1.5.4
+%global common_ver 0.10
+%global service_ver 1.0-rc4
+%global parent_ver 6
 Name:           auto
-Version:        1.3
+Version:        %{auto_ver}
 Release:        0
 Summary:        A collection of source code generators for Java
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://github.com/google/auto
 Source0:        https://github.com/google/auto/archive/auto-value-%{version}.tar.gz
+Source1:        https://github.com/google/auto/archive/auto-common-%{common_ver}.tar.gz
+Source2:        https://github.com/google/auto/archive/auto-service-%{service_ver}.tar.gz
+Source3:        https://github.com/google/auto/archive/auto-parent-%{parent_ver}.tar.gz
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.squareup:javapoet)
-BuildRequires:  mvn(javax.annotation:jsr250-api)
-BuildRequires:  mvn(javax.inject:javax.inject)
-BuildRequires:  mvn(org.ow2.asm:asm)
-BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildArch:      noarch
 
 %description
@@ -40,17 +44,11 @@ that automate those types of tasks.
 %package common
 Summary:        Auto Common Utilities
 Group:          Development/Libraries/Java
+Obsoletes:      %{name}-factory < %{version}-%{release}
 
 %description common
 Common utilities for creating annotation processors.
 
-%package factory
-Summary:        JSR-330-compatible factories
-Group:          Development/Libraries/Java
-
-%description factory
-A source code generator for JSR-330-compatible factories.
-
 %package service
 Summary:        Provider-configuration files for ServiceLoader
 Group:          Development/Libraries/Java
@@ -75,40 +73,44 @@ Group:          Documentation/HTML
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n auto-auto-value-%{version}
+%setup -q -n auto-auto-value-%{version} -a1 -a2 -a3
-find -name '*.class' -print -delete
+rm -rf pom.xml factory/ common/ service/
-find -name '*.jar' -print -delete
+mv auto-auto-parent-%{parent_ver}/pom.xml .
+mv auto-auto-common-%{common_ver}/common common
+mv auto-auto-service-%{service_ver}/service service
 
-%pom_xpath_inject "pom:project" "
+# remove unnecessary dependency on parent POM
-<modules>
+%pom_remove_parent
-  <module>common</module>
-  <module>factory</module>
-  <module>service</module>
-  <module>value</module>
-</modules>"
 
-%pom_xpath_set "pom:project/pom:version" %{version}
+# Disable factory module due to missing dep:
-for p in common factory service value ;do
+# com.google.googlejavaformat:google-java-format
-  %pom_xpath_set "pom:parent/pom:version" %{version} ${p}
+%pom_disable_module factory build-pom.xml
-  %pom_xpath_set "pom:project/pom:version" %{version} ${p}
+
-  %pom_xpath_remove "pom:dependency[pom:scope = 'test']" ${p}
+# Fix deps in service module
-done
+%pom_xpath_set "pom:parent/pom:version" 6 service
+%pom_change_dep com.google.auto:auto-common com.google.auto:auto-common:0.10 service
 
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
 %pom_remove_plugin :maven-shade-plugin value
 %pom_remove_plugin :maven-invoker-plugin value
-%pom_remove_plugin :maven-invoker-plugin factory
 
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-common']/pom:version" %{version} factory service value
+# Broader guava compatibility
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-service']/pom:version" %{version} factory value
+sed -i -e 's/23.5-jre/20.0/' pom.xml
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-value']/pom:version" %{version} factory
+sed -i -e 's/toImmutableMap/toMap/' -e 's/static com.google.common.collect.ImmutableMap/static java.util.stream.Collectors/' \
+  -e '/elementValues/s/ImmutableMap/Map/' \
+  common/src/main/java/com/google/auto/common/SimpleAnnotationMirror.java
+sed -i -e 's/toImmutableSet/toSet/' -e 's/static com.google.common.collect.ImmutableSet/static java.util.stream.Collectors/' \
+  -e '/ImmutableSet</s/ImmutableSet/Set/' \
+  service/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java
 
-%pom_add_dep javax.annotation:jsr250-api value
+%{mvn_package} :build-only __noinstall
 
 %build
-
+%{mvn_build} -sf -- \
-# Unavailable test deps
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-%{mvn_build} -sf -- -Dsource=6
+	-Dmaven.compiler.release=8 \
+%endif
+	-f build-pom.xml -Dsource=8 -Dfile.encoding=UTF-8
 
 %install
 %mvn_install
@@ -123,10 +125,6 @@ done
 %doc common/README.md
 %license LICENSE.txt
 
-%files factory -f .mfiles-%{name}-factory
-%doc factory/README.md
-%license LICENSE.txt
-
 %files service -f .mfiles-%{name}-service
 %doc service/README.md
 %license LICENSE.txt