pool/geronimo-specs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 522245 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/522245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geronimo-specs?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:19:56 +00:00 committed by Git OBS Bridge
commit e2d0089402
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geronimo-specs.build.xml
View File

@ -229,7 +229,7 @@
<mkdir dir="${gbuild.dir}/${dist}"/>
<mkdir dir="${gbuild.dir}/${apidocs}"/>
<javac srcdir="${gbuild.dir}/${src}" destdir="${gbuild.dir}/${build}" classpath="${gbuild.classpath}"/>
<javac srcdir="${gbuild.dir}/${src}" destdir="${gbuild.dir}/${build}" classpath="${gbuild.classpath}" encoding="UTF-8"/>
<jar jarfile="${gbuild.dir}/${dist}/${gbuild.jar}" basedir="${gbuild.dir}/${build}"/>

9
geronimo-specs.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com
- Specify java source and target version to 1.6 in order to allow
build with jdk9
- Modified source:
* geronimo-specs.build.xml
- specify encoding UTF-8, since the files use UTF-8 characters
-------------------------------------------------------------------
Fri May 19 14:33:51 UTC 2017 - tchvatal@suse.com

4
geronimo-specs.spec
View File

@ -116,7 +116,7 @@ Patch4: geronimo-specs-j2ee-1.4-pom_xml.patch
Patch5: geronimo-specs-corba-2.3-pom_xml.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.5.0
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit >= 3.8.1
@ -807,7 +807,7 @@ ln -s %{_javadir} external_repo/JPP
cp %{SOURCE1000} build.xml
%build
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Didlj=%{java_home}/bin/idlj
%install