Author: dblevins Date: Thu May 27 20:57:33 2010 New Revision: 948994 URL: http://svn.apache.org/viewvc?rev=948994&view=rev Log: svn merge -r 947016:947017 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=947017&view=rev ------------------------------------------------------------------------ r947017 | jlmonteiro | 2010-05-21 07:18:18 -0700 (Fri, 21 May 2010) | 3 lines Switch Maven compiler to Java 1.6 Add some missing versions (plugins) --> can lead to some unpredictable results Enhance Maven 3 compatibility ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) openejb/branches/openejb-3.1.x/pom.xml Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:57:33 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017 Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:57:33 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:57:33 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017 Modified: openejb/branches/openejb-3.1.x/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/pom.xml?rev=948994&r1=948993&r2=948994&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/pom.xml (original) +++ openejb/branches/openejb-3.1.x/pom.xml Thu May 27 20:57:33 2010 @@ -102,7 +102,7 @@ <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg> <openejb.osgi.export.version>${project.version}</openejb.osgi.export.version> <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import> - <openejb.osgi.symbolic.name>${groupId}.${artifactId}</openejb.osgi.symbolic.name> + <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name> <!-- Used in assembly/openejb-tomcat* projects --> <tomcatVersion>6.0.16</tomcatVersion> @@ -134,15 +134,22 @@ <version>2.0.1</version> <extensions>true</extensions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <version>1.0-alpha-3</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> <plugin> @@ -157,7 +164,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Bundle-Name>Apache ${pom.name}</Bundle-Name> + <Bundle-Name>Apache ${project.name}</Bundle-Name> <Export-Package>${openejb.osgi.export}</Export-Package> <Import-Package>${openejb.osgi.import}</Import-Package> <Private-Package>${openejb.osgi.private.pkg}</Private-Package> @@ -381,7 +388,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rat-maven-plugin</artifactId> - <version>1.0-alpha-3</version> <executions> <execution> <phase>verify</phase>
