Skip to content

Commit

Permalink
updated restlet to version 2.0.15 and jersey to 1.14, also updated th…
Browse files Browse the repository at this point in the history
…e release plugin to the latest
  • Loading branch information
Burt Beckwith committed Dec 4, 2012
1 parent 2adf2a4 commit 9068097
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .classpath
Expand Up @@ -8,17 +8,17 @@
<classpathentry kind="src" path="test/integration"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path=".link_to_grails_plugins/release-2.1.0/src/groovy">
<classpathentry kind="src" path=".link_to_grails_plugins/release-2.2.0/src/groovy">
<attributes>
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".link_to_grails_plugins/release-2.1.0/src/java">
<classpathentry kind="src" path=".link_to_grails_plugins/release-2.2.0/src/java">
<attributes>
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".link_to_grails_plugins/rest-client-builder-1.0.2/src/groovy">
<classpathentry kind="src" path=".link_to_grails_plugins/rest-client-builder-1.0.3/src/groovy">
<attributes>
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
Expand Down
25 changes: 13 additions & 12 deletions grails-app/conf/BuildConfig.groovy
Expand Up @@ -32,42 +32,43 @@ grails.project.dependency.resolution = {
dependencies {
compile 'asm:asm:3.3'

compile 'org.restlet.gae:org.restlet:2.0-RC3'
String restletVersion = '2.0.15'
String jerseyVersion = '1.14'

compile('org.restlet.gae:org.restlet.ext.servlet:2.0-RC3') {
compile "org.restlet.gae:org.restlet:$restletVersion"

compile("org.restlet.gae:org.restlet.ext.servlet:$restletVersion") {
excludes 'servlet-api', 'org.restlet'
}

// A modified version (with removed META-INF/services/javax.ws.rs.ext.RuntimeDelegate)
// is contained in the project's lib folder. This is needed because of a bug described
// at http://restlet.tigris.org/issues/show_bug.cgi?id=1251
// compile('org.restlet.gae:org.restlet.ext.jaxrs:2.0-RC3') {
// excludes 'xml-apis', 'xmlParserAPIs'
// }
// compile "org.restlet.gae:org.restlet.ext.jaxrs:$restletVersion"

compile('org.restlet.gae:org.restlet.ext.json:2.0-RC3') {
compile("org.restlet.gae:org.restlet.ext.json:$restletVersion") {
excludes 'org.restlet.lib.org.json', 'org.restlet'
}

compile('com.sun.jersey:jersey-core:1.12') {
compile("com.sun.jersey:jersey-core:$jerseyVersion") {
excludes 'jsr311-api', 'mail', 'jaxb-api', 'osgi_R4_core', 'junit'
}

compile('com.sun.jersey:jersey-servlet:1.12') {
compile("com.sun.jersey:jersey-servlet:$jerseyVersion") {
excludes 'javax.servlet-api', 'jsp-api', 'javax.ejb', 'weld-osgi-bundle',
'persistence-api', 'ant', 'osgi_R4_core', 'junit', 'commons-io'
}

compile('com.sun.jersey:jersey-server:1.12') {
compile("com.sun.jersey:jersey-server:$jerseyVersion") {
excludes 'asm', 'mail', 'jaxb-api', 'jsr250-api', 'osgi_R4_core', 'junit', 'commons-io'
}

compile('com.sun.jersey:jersey-json:1.12') {
compile("com.sun.jersey:jersey-json:$jerseyVersion") {
excludes 'jettison', 'jaxb-impl', 'jackson-core-asl', 'jackson-mapper-asl',
'jackson-jaxrs', 'jackson-xc', 'junit'
}

compile('com.sun.jersey.contribs:jersey-spring:1.12') {
compile("com.sun.jersey.contribs:jersey-spring:$jerseyVersion") {
excludes 'servlet-api', 'testng', 'jaxb-impl', 'jsr250-api', 'junit'
}

Expand All @@ -86,7 +87,7 @@ grails.project.dependency.resolution = {
}

plugins {
build(':release:2.1.0', ':rest-client-builder:1.0.2') {
build(':release:2.2.0', ':rest-client-builder:1.0.3') {
export = false
}
}
Expand Down
Binary file removed lib/org.restlet.ext.jaxrs-2.0-RC3.jar
Binary file not shown.
Binary file added lib/org.restlet.ext.jaxrs-2.0.15.jar
Binary file not shown.

0 comments on commit 9068097

Please sign in to comment.