Compare commits

...

No commits in common. "c8-stream-3.6" and "c8-beta-stream-201801" have entirely different histories.

2 changed files with 7 additions and 18 deletions

View File

@ -6,8 +6,8 @@
# Compile classes. # Compile classes.
-javac -g -d build/classes `find src -name *.java` -javac -g -d build/classes `find src -name *.java`
-javac -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ -javac -g -classpath build/classes:lib/junit.jar -d build/tck/classes \
+javac -source 1.6 -target 1.6 -g -d build/classes `find src -name *.java` +javac -source 1.5 -target 1.5 -g -d build/classes `find src -name *.java`
+javac -source 1.6 -target 1.6 -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ +javac -source 1.5 -target 1.5 -g -classpath build/classes:lib/junit.jar -d build/tck/classes \
`find tck -name *.java` `find tck -name *.java`
FOOTER="<font size='-1'>Copyright (C) 2009 <a href='http://code.google.com/p/atinject/'>\ FOOTER="<font size='-1'>Copyright (C) 2009 <a href='http://code.google.com/p/atinject/'>\

View File

@ -1,6 +1,6 @@
Name: atinject Name: atinject
Version: 1 Version: 1
Release: 31.20100611svn86%{?dist} Release: 28.20100611svn86%{?dist}
Summary: Dependency injection specification for Java (JSR-330) Summary: Dependency injection specification for Java (JSR-330)
License: ASL 2.0 License: ASL 2.0
URL: http://code.google.com/p/atinject/ URL: http://code.google.com/p/atinject/
@ -18,11 +18,11 @@ Source1: MANIFEST.MF
Source2: MANIFEST-TCK.MF Source2: MANIFEST-TCK.MF
Source3: http://www.apache.org/licenses/LICENSE-2.0.txt Source3: http://www.apache.org/licenses/LICENSE-2.0.txt
# Compile with source/target 1.6 # Compile with source/target 1.5
Patch0: %{name}-target-1.6.patch Patch0: %{name}-target-1.5.patch
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: java-1.8.0-openjdk-devel BuildRequires: java-devel
BuildRequires: junit BuildRequires: junit
%description %description
@ -40,7 +40,6 @@ Requires: junit
%description tck %description tck
%{summary}. %{summary}.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
@ -66,7 +65,6 @@ set -e
alias rm=: alias rm=:
alias xargs=: alias xargs=:
alias javadoc='javadoc -Xdoclint:none' alias javadoc='javadoc -Xdoclint:none'
export PATH="%{_jvmlibdir}/java-1.8.0-openjdk/bin:${PATH}"
. ./build.sh . ./build.sh
# Inject OSGi manifests required by Eclipse. # Inject OSGi manifests required by Eclipse.
@ -81,21 +79,12 @@ mv build/tck/javadoc build/javadoc/tck
%install %install
%mvn_install -J build/javadoc %mvn_install -J build/javadoc
%files -n %{?module_prefix}%{name} -f .mfiles %files -f .mfiles
%license LICENSE %license LICENSE
%files tck -f .mfiles-tck %files tck -f .mfiles-tck
%changelog %changelog
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-31.20100611svn86
- Build with OpenJDK 8
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-30.20100611svn86
- Mass rebuild for javapackages-tools 201902
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-29.20100611svn86
- Mass rebuild for javapackages-tools 201901
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-28.20100611svn86 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-28.20100611svn86
- Remove javax.inject Provides - Remove javax.inject Provides