Hi
The diff that I am attaching is related to the move of the jruby
specific code to the contribs location under grizzly svn code base.
These changes include :
1. Make use of the last released grizzly version instead of relying on
the trunk (SNAPSHOT) bits
2. Properties defined for some common version numbers that are being
used in the jruby area
3. Be able to just checkout grizzly/trunk/contribs/jruby and build it
independently
Files impacted :
trunk/pom.xml
trunk/contribs/jruby/pom.xml
trunk/contribs/bundles/jruby/pom.xml
Have checked out the new workspace today, deleted ~/.m2/repository and
did a build from trunk/contribs/jruby to ensure that it builds correctly.
Thanks
Pramod Gopinath
Index: trunk/pom.xml
===================================================================
--- trunk/pom.xml (revision 872)
+++ trunk/pom.xml (working copy)
@@ -219,8 +219,10 @@
</distributionManagement>
<properties>
<grizzly-version>1.7-SNAPSHOT</grizzly-version>
+ <grizzly-released-version>1.7.2</grizzly-released-version>
<grizzly-next-version>1.7.3</grizzly-next-version>
<junit-version>3.8.1</junit-version>
- <grizzly-jruby-version>1.7-SNAPSHOT</grizzly-jruby-version>
+ <grizzly-jruby-version>0.1.2</grizzly-jruby-version>
+ <maven-plugin.version>1.0.0</maven-plugin.version>
</properties>
</project>
Index: trunk/contribs/jruby/pom.xml
===================================================================
--- trunk/contribs/jruby/pom.xml (revision 872)
+++ trunk/contribs/jruby/pom.xml (working copy)
@@ -15,6 +15,11 @@
<url>
https://grizzly.dev.java.net</url>
<repositories>
<repository>
+ <id>maven2.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>
http://download.java.net/maven/2</url>
+ </repository>
+ <repository>
<id>java.net</id>
<name>maven-repository.dev.java.net</name>
<url>
https://maven-repository.dev.java.net/nonav/repository/</url>
@@ -26,6 +31,12 @@
<url>
http://repository.codehaus.org</url>
</repository>
</repositories>
+ <properties>
+ <jruby.version>1.1RC2</jruby.version>
+ <asm.version>2.2.3</asm.version>
+ <backport-util.version>2.0_01_pd</backport-util.version>
+
+ </properties>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@@ -81,37 +92,37 @@
<artifactItem>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</artifactItem>
<artifactItem>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http-utils</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</artifactItem>
<artifactItem>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</artifactItem>
<artifactItem>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-rcm</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</artifactItem>
<artifactItem>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.1RC1</version>
+ <version>${jruby.version}</version>
</artifactItem>
<artifactItem>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>${asm.version}</version>
</artifactItem>
<artifactItem>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.0_01_pd</version>
+ <version>${backport-util.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>./lib/</outputDirectory>
@@ -140,22 +151,22 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.0_01_pd</version>
+ <version>${backport-util.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.1RC1</version>
+ <version>${jruby.version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Index: trunk/contribs/bundles/jruby/pom.xml
===================================================================
--- trunk/contribs/bundles/jruby/pom.xml (revision 872)
+++ trunk/contribs/bundles/jruby/pom.xml (working copy)
@@ -10,9 +10,14 @@
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-jruby-webserver</artifactId>
<packaging>bundle</packaging>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
<name>grizzly-jruby-webserver</name>
<url>
https://grizzly.dev.java.net</url>
+ <properties>
+ <jruby.version>1.1RC2</jruby.version>
+ <asm.version>2.2.3</asm.version>
+ <backport-util.version>2.0_01_pd</backport-util.version>
+ </properties>
<build>
<defaultGoal>install</defaultGoal>
<resources>
@@ -32,7 +37,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,22 +82,22 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.0_01_pd</version>
+ <version>${backport-util.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.0</version>
+ <version>${jruby.version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -103,37 +108,37 @@
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http-utils</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-rcm</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-jruby</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-jruby-version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-portunif</artifactId>
- <version>${grizzly-version}</version>
+ <version>${grizzly-released-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${maven-plugin.version}</version>
</dependency>
</dependencies>
</project>