diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 1fe3c9951e..a300495e9d 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -6,11 +6,47 @@
 	<packaging>jar</packaging>
 	<name>Spring Core Abstractions and Utilities</name>
 	<version>3.0.0.M1</version>
+	<repositories>
+		<repository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
+		</repository>		
+	</repositories>
+	<build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 			<version>1.1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.core</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>com.springsource.javax.el</artifactId>
+			<version>2.1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.cglib</groupId>
+			<artifactId>com.springsource.net.sf.cglib</artifactId>
+			<version>2.1.3</version>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.springframework.beans/template.mf b/org.springframework.beans/template.mf
index a4871d4dee..0eb68c8010 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -2,13 +2,13 @@ Bundle-SymbolicName: org.springframework.beans
 Bundle-Name: Spring Beans
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Template:
+Import-Template: 
  javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.core.*;version="[3.0.0, 3.0.0]",
  org.springframework.util.*;version="[3.0.0, 3.0.0]",
-Unversioned-Imports:
+Unversioned-Imports: 
  javax.xml.parsers.*,
  org.w3c.dom.*,
- org.xml.sax.*
\ No newline at end of file
+ org.xml.sax.*
diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index 8532a4dcc1..95b26bd8ec 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -21,9 +21,9 @@
 	<dependencies>
 		<!-- compile dependencies -->
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
+		<!-- optional dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime" />
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional->compile" />
-		<!--<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="1.6.2.RELEASE" conf="optional->compile" />-->
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
 		<!-- These should be replaced with the internal repackaging of ASM -->
 		<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm" rev="2.2.3" conf="optional->compile" />
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 29b7a5ae55..b4cee14adc 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -6,11 +6,54 @@
 	<packaging>jar</packaging>
 	<name>Spring Core Abstractions and Utilities</name>
 	<version>3.0.0.M1</version>
+	<repositories>
+		<repository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
+		</repository>		
+	</repositories>
+	<build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+		    <version>1.1.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.log4j</groupId>
+		    <artifactId>com.springsource.org.apache.log4j</artifactId>
+		    <version>1.2.15</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+			<version>3.2.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+			<version>1.6.2.RELEASE</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file