Title: [waffle-scm] [329] trunk: Excluded (unused) invalid transitive dependency openejb-loader.
Revision
329
Author
mauro
Date
2007-11-02 12:24:39 -0500 (Fri, 02 Nov 2007)

Log Message

Excluded (unused) invalid transitive dependency openejb-loader.
Updated eclipse .classpath optional dependencies.

Modified Paths

Diff

Modified: trunk/.classpath (328 => 329)

--- trunk/.classpath	2007-10-15 15:54:37 UTC (rev 328)
+++ trunk/.classpath	2007-11-02 17:24:39 UTC (rev 329)
@@ -19,13 +19,12 @@
 	<classpathentry kind="src" path="examples/simple-example/src/main/java"/>
 	<classpathentry kind="src" path="examples/simple-example/src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-    <!-- These following deps are as well since the M2 container only picks up deps in the default profile --> 
-    <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
+	<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-core/1.3.5/struts-core-1.3.5.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: trunk/extensions/webcontainer/pom.xml (328 => 329)

--- trunk/extensions/webcontainer/pom.xml	2007-10-15 15:54:37 UTC (rev 328)
+++ trunk/extensions/webcontainer/pom.xml	2007-11-02 17:24:39 UTC (rev 329)
@@ -1,42 +1,50 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <packaging>jar</packaging>
-  <artifactId>waffle-webcontainer</artifactId>
-  <name>Waffle WebContainer</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.codehaus.waffle</groupId>
+		<artifactId>waffle-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<packaging>jar</packaging>
+	<artifactId>waffle-webcontainer</artifactId>
+	<name>Waffle WebContainer</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.nanocontainer</groupId>
-      <artifactId>nanocontainer-webcontainer</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Test-scoped -->
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.3</version>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>waffle</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.nanocontainer</groupId>
+			<artifactId>nanocontainer-webcontainer</artifactId>
+			<version>1.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>openejb</groupId>
+                    <artifactId>openejb-loader</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>servlet-api-2.5</artifactId>
+			<version>6.1.3</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Test-scoped -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>6.1.3</version>
+		</dependency>
+	</dependencies>
 
 </project>


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to