Inlined ...
~/workspaces/glassfish/v3 >svn diff
Index: pom.xml
===================================================================
--- pom.xml (revision 21198)
+++ pom.xml (working copy)
@@ -133,7 +133,7 @@
<major_version>10</major_version>
<minor_version>0</minor_version>
<nucleus.version>0.1-SNAPSHOT</nucleus.version>
- <jruby-scripting.version>0.6.6</jruby-scripting.version>
+ <jruby-scripting.version>0.6.7</jruby-scripting.version>
<jmac-api.version>1.0-rev-1</jmac-api.version>
<jaxws-ri.version>2.1.3</jaxws-ri.version>
<stax-api.version>1.0-2</stax-api.version>
Index: distributions/web/pom.xml
===================================================================
--- distributions/web/pom.xml (revision 21198)
+++ distributions/web/pom.xml (working copy)
@@ -117,15 +117,12 @@
<artifactId>console-plugin-service</artifactId>
<version>${admingui.version}</version>
</dependency-->
- <!-- TODO (Sahoo): Fix jruby to use new HK2 version.
- Until then, don't distribute.
<dependency>
<groupId>org.glassfish.scripting</groupId>
<artifactId>jruby-all</artifactId>
<version>${jruby-scripting.version}</version>
<type>pom</type>
</dependency>
- -->
<dependency>
<groupId>org.glassfish.connectors.jdbc-ra.jdbc-ra-distribution</groupId>
<artifactId>jdbc-ra</artifactId>
Thanks,
-Arun
Sahoo wrote:
> Arun Gupta wrote:
>> However when I specify 0.6.7 in the main pom.xml then the generated
>> web.zip contains jruby-all-0.6.7.pom in the modules directory (instead
>> of jar). If I use the original pom.xml (which specifies 0.6.6) the
>> jruby connector is not even bundled in the modules directory. Any
>> pointers on why this is occurring would be useful ?
>>
> Can you please send me the diff?
>
> Thanks,
> Sahoo
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>
--
Application Platform, Sun Microsystems, Inc.
Blog: http://blogs.sun.com/arungupta