[sisu] Build with Java 8

Michael Šimáček msimacek at fedoraproject.org
Thu May 8 18:58:24 UTC 2014


commit a275a53461cdd693f0de914064d386de3433e303
Author: Michael Simacek <msimacek at redhat.com>
Date:   Wed May 7 14:16:44 2014 +0200

    Build with Java 8

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


More information about the scm-commits mailing list