You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/11/09 01:57:46 UTC

svn commit: r472723 - in /incubator/openejb/trunk/openejb2: modules/openejb-yoko/pom.xml pom.xml

Author: dain
Date: Wed Nov  8 16:57:46 2006
New Revision: 472723

URL: http://svn.apache.org/viewvc?view=rev&rev=472723
Log:
Java5 is now required but we still create 1.4 byte code.
Disabled yoko NameServiceTest since it broken due to endorsed directory problems.

Modified:
    incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml
    incubator/openejb/trunk/openejb2/pom.xml

Modified: incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml?view=diff&rev=472723&r1=472722&r2=472723
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml Wed Nov  8 16:57:46 2006
@@ -99,18 +99,25 @@
                 <configuration>
                     <source>1.4</source>
                     <target>1.4</target>
+                    <compilerArguments>
+                        <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
+                    </compilerArguments>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <forkMode>once</forkMode>
                     <systemProperties>
                       <property>
                         <name>java.endorsed.dirs</name>
-                        <value>${basedir}/target/endorsed</value>
+                        <value>${project.build.directory}/endorsed</value>
                       </property>
                     </systemProperties>
+                    <excludes>
+                      <exclude>**/NameServiceTest*</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
             <plugin>

Modified: incubator/openejb/trunk/openejb2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/pom.xml?view=diff&rev=472723&r1=472722&r2=472723
==============================================================================
--- incubator/openejb/trunk/openejb2/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/pom.xml Wed Nov  8 16:57:46 2006
@@ -720,7 +720,7 @@
                             <goal>require-java-version</goal>
                         </goals>
                         <configuration>
-                            <version>1.4*</version>
+                            <version>1.5*</version>
                         </configuration>
                     </execution>
 
@@ -739,6 +739,14 @@
                         </goals>
                     </execution>
                 </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
             </plugin>
         </plugins>
     </build>