Build with Java 8
This commit is contained in:
parent
92f0e213d8
commit
a275a53461
@ -1,7 +1,7 @@
|
|||||||
Name: sisu
|
Name: sisu
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.2.1
|
Version: 0.2.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Eclipse dependency injection framework
|
Summary: Eclipse dependency injection framework
|
||||||
# bundled asm is under BSD
|
# bundled asm is under BSD
|
||||||
# See also: https://fedorahosted.org/fpc/ticket/346
|
# See also: https://fedorahosted.org/fpc/ticket/346
|
||||||
@ -17,9 +17,6 @@ Patch0: %{name}-OSGi-import-guava.patch
|
|||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# FIXME: sisu fails to build under Java 8
|
|
||||||
BuildRequires: java-1.7.0-openjdk-devel
|
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(com.google.inject:guice)
|
BuildRequires: mvn(com.google.inject:guice)
|
||||||
BuildRequires: mvn(javax.enterprise:cdi-api)
|
BuildRequires: mvn(javax.enterprise:cdi-api)
|
||||||
@ -177,7 +174,6 @@ cat <<EOF >pom.xml
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export JAVA_HOME=/usr/lib/jvm/java-1.7.0
|
|
||||||
# Tycho inject dependencies with system scope. Disable installation
|
# Tycho inject dependencies with system scope. Disable installation
|
||||||
# of effective POMs until Mvn can handle system-scoped deps.
|
# of effective POMs until Mvn can handle system-scoped deps.
|
||||||
%mvn_build -i
|
%mvn_build -i
|
||||||
@ -201,6 +197,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 07 2014 Michael Simacek <msimacek@redhat.com> - 1:0.2.1-3
|
||||||
|
- Build with Java 8
|
||||||
|
|
||||||
* Wed Apr 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-2
|
* Wed Apr 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-2
|
||||||
- Import guava in OSGi manifest
|
- Import guava in OSGi manifest
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user