diff --git a/.classpath b/.classpath
index 29d5cf85aa6..8e8518daff0 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,14 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry excluding="**/CVS/*" kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<accessrules>
+			<accessrule kind="accessible" pattern="javax/script/**"/>
+			<accessrule kind="discouraged" pattern="sun/misc/Unsafe"/>
+			<accessrule kind="discouraged" pattern="sun/misc/Signal"/>
+			<accessrule kind="discouraged" pattern="sun/misc/SignalHandler"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="lib" path="build_lib/jna.jar"/>
 	<classpathentry kind="lib" path="build_lib/junit.jar"/>
 	<classpathentry kind="lib" path="build_lib/jline-0.9.93.jar"/>
diff --git a/.project b/.project
index 494db332210..c083d263937 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jruby_trunk</name>
+	<name>JRuby</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,9 +20,14 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000000..1ca8ab61c57
--- /dev/null
+++ b/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Wed Dec 30 15:00:47 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=false
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/pom.xml b/pom.xml
index e3bdb1dcf81..5143e866b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>