Fridrich Strba 2024-04-10 17:01:46 +00:00 committed by Git OBS Bridge
parent f1613a8e4f
commit b5dc73a7d9
6 changed files with 35 additions and 18 deletions

View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/google/error-prone.git</param>
<param name="revision">v2.11.0</param>
<param name="revision">v2.26.1</param>
<param name="match-tag">v*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>

BIN
error-prone-2.11.0.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
error-prone-2.26.1.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -8,9 +8,10 @@
<property name="project.groupId" value="com.google.errorprone"/>
<property name="project.artifactId" value="error_prone_annotations"/>
<property name="project.version" value="2.11.0"/>
<!-- <property name="project.version" value="2.26.1"/> -->
<property name="compiler.source" value="1.8"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@ -41,6 +42,7 @@
encoding="UTF-8"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@ -48,6 +50,23 @@
<src>
<pathelement location="${build.srcDir}"/>
</src>
<exclude name="**/module-info.java"/>
</javac>
<javac destdir="${build.outputDir}"
nowarn="false"
debug="true"
encoding="UTF-8"
optimize="false"
deprecation="true"
release="9"
target="9"
verbose="false"
fork="false"
source="9">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<include name="**/module-info.java"/>
</javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}">

View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package google-errorprone-annotations
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%global artifactId error_prone_annotations
%global group_name google-errorprone
Name: %{group_name}-annotations
Version: 2.11.0
Version: 2.26.1
Release: 0
Summary: error-prone annotations
License: Apache-2.0
@ -30,7 +30,8 @@ Source0: %{source_name}-%{version}.tar.xz
Source1: %{name}-build.xml
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: java-devel >= 9
BuildRequires: javapackages-local >= 6
BuildArch: noarch
%description
@ -49,14 +50,10 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{source_name}-%{version}
cp %{SOURCE1} annotations/build.xml
%pom_remove_parent annotations
%pom_xpath_inject pom:project "
<groupId>com.google.errorprone</groupId>
<version>2.11.0</version>" annotations
%build
pushd annotations
%{ant} jar javadoc
%{ant} -Dproject.version=%{version} jar javadoc
popd
%install
@ -65,7 +62,7 @@ install -d -m 0755 %{buildroot}%{_javadir}/%{group_name}
install -p -m 0644 annotations/target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{group_name}/annotations.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{group_name}
install -pm 644 annotations/pom.xml %{buildroot}%{_mavenpomdir}/%{group_name}/annotations.pom
%mvn_install_pom annotations/pom.xml %{buildroot}%{_mavenpomdir}/%{group_name}/annotations.pom
%add_maven_depmap %{group_name}/annotations.pom %{group_name}/annotations.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}

View File

@ -1,7 +1,7 @@
#
# spec file for package google-errorprone
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%global source_name error-prone
Name: google-errorprone
Version: 2.11.0
Version: 2.26.1
Release: 0
Summary: Google Error Prone
License: Apache-2.0
@ -27,6 +27,7 @@ URL: https://errorprone.info
Source0: %{source_name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin)
BuildRequires: mvn(com.google.auto.service:auto-service)
BuildRequires: mvn(com.google.auto.service:auto-service-annotations)
BuildRequires: mvn(com.google.code.gson:gson)