diff --git a/pom.xml b/pom.xml
index 72026ca00b..4f2b49e884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,43 +466,12 @@
 			</plugin>
 		</plugins>
 	</reporting>
-	<repositories>
-		<repository>
-			<id>glassfish</id>
-			<name>Glassfish Repository</name>
-			<url>http://download.java.net/maven/glassfish</url>
-			<snapshots><enabled>false</enabled></snapshots>
-		</repository>
-		<repository>
-			<id>jboss</id>
-			<name>JBoss Repository</name>
-			<url>http://repository.jboss.org/maven2</url>
-			<releases><enabled>true</enabled></releases>
-			<snapshots><enabled>false</enabled></snapshots>
-		</repository>
-		<repository>
-			<id>objectstyle</id>
-			<name>ObjectStyle.org Repository</name>
-			<url>http://objectstyle.org/maven2/</url>
-			<snapshots><enabled>false</enabled></snapshots>
-		</repository>
-	</repositories>
 	<pluginRepositories>
+		<!-- necessary for bundlor and utils -->
 		<pluginRepository>
-			<id>com.springsource.repository.bundles.release</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/release/</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>com.springsource.repository.bundles.milestone</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
-			<url>http://repository.springsource.com/maven/bundles/milestone</url>
-			<snapshots><enabled>false</enabled></snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>com.springsource.repository.bundles.snapshot</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
-			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+			<id>repository.plugin.springsource.release</id>
+			<name>SpringSource EBR</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</pluginRepository>
 	</pluginRepositories>
 	<dependencies>
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index b15f144d24..ceb812ded6 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -113,6 +113,8 @@
 						<id>generate-sql</id>
 						<phase>generate-sources</phase>
 						<configuration>
+							<!-- task requires 'foundrylogic.vpp' dependency which is available only in
+								 the objectstyle repository. see <repositories> section below -->
 							<tasks>
 								<typedef resource="foundrylogic/vpp/typedef.properties" />
 								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
@@ -252,4 +254,13 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<!-- necessary for foundrylogic.vpp dependency -->
+		<repository>
+			<id>repository.objectstyle</id>
+			<name>ObjectStyle.org Repository</name>
+			<url>http://objectstyle.org/maven2/</url>
+			<snapshots><enabled>false</enabled></snapshots>
+		</repository>
+	</repositories>
 </project>
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index 5bc571a52e..df878c2e27 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -17,13 +17,6 @@
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jms_1.1_spec</artifactId>
 			<version>1.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.jms</groupId>
-			<artifactId>jms</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index a90850bfb3..e780b12463 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -9,6 +9,7 @@
 	<artifactId>cafe</artifactId>
 	<name>Spring Integration Cafe Sample</name>
 	<dependencies>
+		<!-- available only within EBR. see <repositories> section below -->
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
@@ -44,4 +45,12 @@
 			</resource>
 		</resources>
 	</build>
+	<repositories>
+		<!-- necessary for org.osgi dependency -->
+		<repository>
+			<id>repository.springsource.external</id>
+			<name>SpringSource EBR</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
+		</repository>
+	</repositories>
 </project>
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index 522a88db46..9f5add6913 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -10,13 +10,6 @@
 	<artifactId>helloworld</artifactId>
 	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<name>Spring Integration Hello World Sample</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.4.2.R34x_v20080826-1230</version>
-		</dependency>
-	</dependencies>
 	<build>
 		<resources>
 			<resource>
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index 210cbc0d1d..f63605cbe0 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -341,13 +341,13 @@
 		</plugins>
 	</build>
 	<repositories>
-		<!-- necessary for roo annotations dependency -->
+		<!-- necessary for roo.annotations dependency -->
 		<repository>
 			<id>repository.springsource.release</id>
 			<name>SpringSource EBR</name>
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</repository>
-		<!-- necessary for hibernate validator dependency -->
+		<!-- necessary for hibernate-validator dependency -->
 		<repository>
 			<id>repository.jboss</id>
 			<name>JBoss Repository</name>
@@ -355,7 +355,7 @@
 			<releases><enabled>true</enabled></releases>
 			<snapshots><enabled>false</enabled></snapshots>
 		</repository>
-		<!-- necessary for jstl dependency -->
+		<!-- necessary for jstl-api dependency -->
 		<repository>
 			<id>repository.glassfish</id>
 			<name>Glassfish Repository</name>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index e42603b870..0ccb9b61cc 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -24,6 +24,20 @@
 			<artifactId>saaj-api</artifactId>
 			<version>1.3</version>
 			<scope>provided</scope>
+			<exclusions>
+				<!-- exclude dependency on javax.activation due to sun binary license restrictions
+					 geronimo-activation dependency directly below provides a workaround -->
+				<exclusion>
+					<groupId>javax.activation</groupId>
+					<artifactId>activation</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<!-- workaround for saaj dependency on javax.activation -->
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-activation_1.1_spec</artifactId>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>stax</groupId>