Merge pull request #286 from secondsun/KEYCLOAK-355

Fixing java 8 build
This commit is contained in:
Bill Burke 2014-03-12 16:43:03 -04:00
commit 7b64d9975e
2 changed files with 19 additions and 4 deletions

View file

@ -99,7 +99,7 @@
</sequential>
</macrodef>
<scriptdef name="define-module-dir" language="javascript">
<scriptdef name="define-module-dir" language="javascript" manager="bsf">
<attribute name="name"/>
<attribute name="slot"/>
<![CDATA[
@ -109,7 +109,7 @@
]]>
</scriptdef>
<scriptdef name="define-bundle-dir" language="javascript">
<scriptdef name="define-bundle-dir" language="javascript" manager="bsf">
<attribute name="name"/>
<attribute name="slot"/>
<![CDATA[
@ -123,7 +123,7 @@
Get the version from the parent directory of the jar. If the parent directory is 'target' this
means that the jar is contained in AS build so extract the version from the file name
-->
<scriptdef name="define-maven-artifact" language="javascript">
<scriptdef name="define-maven-artifact" language="javascript" manager="bsf">
<attribute name="group"/>
<attribute name="artifact"/>
<attribute name="classifier"/>
@ -258,7 +258,7 @@
</sequential>
</macrodef>
<scriptdef name="define-resource-root" language="javascript">
<scriptdef name="define-resource-root" language="javascript" manager="bsf">
<attribute name="path"/>
<attribute name="jandex"/>
<![CDATA[

View file

@ -126,6 +126,21 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
<version>1.9.3</version>
</dependency>
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-api</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>1.7R2</version>
</dependency>
</dependencies>
</plugin>
<plugin>