rpms/atinject
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow building against Java 11

Browse Source
This commit is contained in:
Mat Booth 2020-06-20 10:33:20 +01:00
parent 6926d4cd86
commit 2c61bb0d30
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atinject-target-1.5.patch
View File

@ -1,13 +0,0 @@
--- atinject-1/build.sh~ 2009-10-14 01:36:31.000000000 +0200
+++ atinject-1/build.sh 2014-06-09 08:21:06.686274678 +0200
@@ -10,8 +10,8 @@
mkdir -p build/tck/dist
# Compile classes.
-javac -g -d build/classes `find src -name *.java`
-javac -g -classpath build/classes:lib/junit.jar -d build/tck/classes \
+javac -source 1.5 -target 1.5 -g -d build/classes `find src -name *.java`
+javac -source 1.5 -target 1.5 -g -classpath build/classes:lib/junit.jar -d build/tck/classes \
`find tck -name *.java`
FOOTER="<font size='-1'>Copyright (C) 2009 <a href='http://code.google.com/p/atinject/'>\

13
atinject.spec
View File

@ -1,6 +1,6 @@
Name: atinject
Version: 1
Release: 32.20100611svn86%{?dist}
Release: 33.20100611svn86%{?dist}
Summary: Dependency injection specification for Java (JSR-330)
License: ASL 2.0
URL: http://code.google.com/p/atinject/
@ -18,9 +18,6 @@ Source1: MANIFEST.MF
Source2: MANIFEST-TCK.MF
Source3: http://www.apache.org/licenses/LICENSE-2.0.txt
# Compile with source/target 1.5
Patch0: %{name}-target-1.5.patch
BuildRequires: javapackages-local
BuildRequires: java-devel
BuildRequires: junit
@ -48,8 +45,6 @@ cp %{SOURCE3} LICENSE
mkdir lib
build-jar-repository -p lib junit
%patch0 -p1
# Fix dep in TCK pom
sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
@ -64,7 +59,8 @@ sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
set -e
alias rm=:
alias xargs=:
alias javadoc='javadoc -Xdoclint:none'
alias javac="javac -source 1.8 -target 1.8"
alias javadoc="javadoc -source 1.8 -Xdoclint:none"
. ./build.sh
# Inject OSGi manifests required by Eclipse.
@ -85,6 +81,9 @@ mv build/tck/javadoc build/javadoc/tck
%files tck -f .mfiles-tck
%changelog
* Sat Jun 20 2020 Mat Booth <mat.booth@redhat.com> - 1-33.20100611svn86
- Allow building against Java 11
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-32.20100611svn86
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild