Author: andygumbrecht
Date: Fri Sep 17 05:25:28 2010
New Revision: 997981

URL: http://svn.apache.org/viewvc?rev=997981&view=rev
Log:
Added maven-compiler-plugin to assembly/openejb-jetty/pom.xml
Corrected ${project.version} in 
assembly/openejb-jetty/openejb-jetty-common/pom.xml

Modified:
    openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
    openejb/trunk/openejb3/assembly/openejb-jetty/pom.xml

Modified: 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml?rev=997981&r1=997980&r2=997981&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml 
(original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml 
Fri Sep 17 05:25:28 2010
@@ -31,7 +31,7 @@
     <packaging>jar</packaging>
     <name>OpenEJB :: Assembly :: Jetty :: Common</name>
     <build>
-        <plugins>
+        <plugins>            
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -77,13 +77,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
+            <artifactId>openejb-jee</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <version>3.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: openejb/trunk/openejb3/assembly/openejb-jetty/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/pom.xml?rev=997981&r1=997980&r2=997981&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/pom.xml Fri Sep 17 05:25:28 
2010
@@ -19,20 +19,34 @@
 <!-- $Rev: 835957 $ $Date: 2009-11-13 11:23:35 -0800 (Fri, 13 Nov 2009) $ -->
 
 <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";>
-  <parent>
-    <artifactId>assembly</artifactId>
-    <groupId>org.apache.openejb</groupId>
-    <version>3.2-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>openejb-jetty</artifactId>
-  <packaging>pom</packaging>
-  <name>OpenEJB :: Assembly :: Jetty</name>
+    <parent>
+        <artifactId>assembly</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <version>3.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openejb-jetty</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenEJB :: Assembly :: Jetty</name>
 
-  <modules>
-    <module>openejb-jetty-loader</module>
-    <module>openejb-jetty-common</module>
-    <module>openejb-jetty-webapp</module>
-  </modules>
+    <modules>
+        <module>openejb-jetty-loader</module>
+        <module>openejb-jetty-common</module>
+        <module>openejb-jetty-webapp</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 


Reply via email to