Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 10 additions and 8 deletions.
  1. +0 −2 Jemfile
  2. +1 −1 README.md
  3. +3 −4 pom.xml
  4. +6 −1 src/main/webapp/WEB-INF/web.xml
View
2 Jemfile
@@ -7,5 +7,3 @@ gem "rake-compiler", "~> 0.8.0"
gem "hoe", "~> 2.13.0"
gem "nokogiri", "~> 1.5.0"
-
-# gem "mechanize", "~> 2.1.1"
View
2 README.md
@@ -10,7 +10,7 @@ If you want more details about the development of this application, [click here]
Getting Started Locally
-----------------------
* Download an install Java (JDK 1.7.0_02-b13 is fine)
- * Install JRuby 1.6.5 (use [RVM](https://rvm.beginrescueend.com/) or [rbenv](https://github.com/sstephenson/rbenv))
+ * Install JRuby 1.6.7 (use [RVM](https://rvm.beginrescueend.com/) or [rbenv](https://github.com/sstephenson/rbenv))
* Download and install Maven 3.0.3
* Download and install Neo4J 1.6
* `export NEO4J_REST_URL=http://localhost:7474/db/data`
View
7 pom.xml
@@ -10,8 +10,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jruby.version>1.6.5</jruby.version>
- <jruby.rack.version>1.1.3</jruby.rack.version>
+ <jruby.version>1.6.7</jruby.version>
+ <jruby.rack.version>1.1.4</jruby.rack.version>
<jetty.version>7.4.5.v20110725</jetty.version>
<servlet.api.version>2.5</servlet.api.version>
<neo4j.version>1.6</neo4j.version>
@@ -28,7 +28,6 @@
<repository>
<id>neo4j-release-repository</id>
<name>Neo4j Maven 2 release repository</name>
- <!--url>http://m2.neo4j.org/releases</url -->
<url>http://m2.neo4j.org/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
@@ -126,7 +125,7 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel</artifactId>
View
7 src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
- <!-- http://rubydoc.info/gems/jruby-rack/1.1.3/frames -->
+ <!-- http://rubydoc.info/gems/jruby-rack/1.1.4/frames -->
<context-param>
<param-name>gem.path</param-name>
@@ -30,6 +30,11 @@
<param-value>log4j</param-value>
</context-param>
+ <context-param>
+ <param-name>jruby.compat.version</param-name>
+ <param-value>1.9</param-value>
+ </context-param>
+
<filter>
<filter-name>RackFilter</filter-name>
<filter-class>org.jruby.rack.RackFilter</filter-class>

No commit comments for this range

Something went wrong with that request. Please try again.