Compare commits

...
Sign in to create a new pull request.

7 commits

Author SHA1 Message Date
Jiri Vanek
5d78b12e83 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-29 20:50:18 +02:00
Fedora Release Engineering
30ffc7c9ff Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 16:24:53 +00:00
Mikolaj Izdebski
ebfe1da389 Build with OpenJDK 25 2025-07-13 09:22:51 +02:00
Mikolaj Izdebski
886ca0dbed Switch javapackages test plan to f43 ref 2025-05-22 13:35:31 +02:00
Mikolaj Izdebski
ba01846bc9 Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
0f9650b1d9 Remove javadoc subpackage 2025-03-03 12:53:39 +01:00
Mikolaj Izdebski
c5193e442d Add classes alias 2025-02-16 17:17:20 +01:00
2 changed files with 8 additions and 13 deletions

View file

@ -17,7 +17,7 @@ BuildRequires: jurand
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(aopalliance:aopalliance)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(com.google.guava:guava)
@ -32,6 +32,8 @@ BuildRequires: mvn(org.ow2.asm:asm)
# xmvn-builddep misses this:
BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
%endif
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 5.1.0-27
%description
Put simply, Guice alleviates the need for factories and the use of new
@ -115,12 +117,6 @@ Summary: Bill of Materials for Guice
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides Bill of Materials module for Guice.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -C
@ -172,6 +168,8 @@ API documentation for %{name}.
#%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<scope>provided</scope>" extensions
%mvn_alias :guice :::classes:
%build
#%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:"
@ -182,7 +180,7 @@ API documentation for %{name}.
%mvn_file ":guice" guice/%{name} %{name}
#%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
# Skip tests because of missing dependency guice-testlib
%mvn_build -f -s
%mvn_build -j -f -s
%install
%mvn_install
@ -208,8 +206,5 @@ API documentation for %{name}.
%files -n guice-bom -f .mfiles-guice-bom
%files javadoc -f .mfiles-javadoc
%license COPYING
%changelog
%autochangelog

View file

@ -1,7 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: f42
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt