Port to Google Guice 5

This commit is contained in:
Mikolaj Izdebski 2023-03-21 09:38:37 +01:00
parent 02524015a6
commit ea7eed2c9a
3 changed files with 7 additions and 6 deletions

View File

@ -8,8 +8,7 @@
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<classifier>no_aop</classifier> <version>5.1.0</version>
<version>4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -28,8 +28,7 @@
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<classifier>no_aop</classifier> <version>5.1.0</version>
<version>4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -3,7 +3,7 @@
Name: sisu Name: sisu
Epoch: 1 Epoch: 1
Version: 0.3.5 Version: 0.3.5
Release: 3%{?dist} Release: 4%{?dist}
Summary: Eclipse dependency injection framework Summary: Eclipse dependency injection framework
# sisu is EPL-1.0, the bundled asm is BSD # sisu is EPL-1.0, the bundled asm is BSD
License: EPL-1.0 and BSD License: EPL-1.0 and BSD
@ -28,7 +28,7 @@ BuildRequires: javapackages-bootstrap-openjdk8
%else %else
BuildRequires: maven-local-openjdk8 BuildRequires: maven-local-openjdk8
BuildRequires: mvn(com.google.inject.extensions:guice-servlet) BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
BuildRequires: mvn(com.google.inject:guice::no_aop:) BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.annotation:javax.annotation-api)
BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(javax.enterprise:cdi-api)
BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.inject:javax.inject)
@ -84,6 +84,9 @@ cp %{SOURCE102} sisu-plexus/pom.xml
%license sisu-inject/LICENSE.txt %license sisu-inject/LICENSE.txt
%changelog %changelog
* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-4
- Port to Google Guice 5
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-3 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild