Merge lp:~pbeaman/akiban-persistit/eclipse-juno-happier into lp:akiban-persistit

[Peter Beaman]

Add a <pluginManagement> stanza in pom.xml to satisfy the m2eclipse plugin.

[lp:~pbeaman/akiban-persistit/eclipse-juno-happier]

342. By Peter Beaman on 2012-08-01

Reformat pom.xml

[Peter Beaman (pbeaman)]

Since the original proposal I formatted the pom.xml file to convert tabs to spaces and arrive at a canonical form.

[Nathan Williams (nwilliams)]

Does the newline in the middle <argline> cause any problems (diff line 56)? That is, does running mvn verify still give us the JVM opts we want?

The --> on diff line 67 is completely spurious, and I'm surprised the xml is valid. I know you didn't add it, but would you mind removing it?

I'm not thrilled about a large blob of IDE specific stuff in the pom. Does it at least build fully from Eclipse? If so, can't argue much.

Feel free to approve when the first 2 comments are in order.

review: Needs Fixing

[Peter Beaman (pbeaman)]

Good catch on the -->. It was actually in trunk, like this. I'll fix it.

                            <!-- [2005-2011]-2012 | 2012 -->
                            <ensureMatch>20(05|06|07|08|09|10|11)\-2012|2012</ensureMatch> -->

Good catch on the line break in arguments - no, that does not work. Will fix.

Re the big blob, I'm not thrilled either, I just don't have a great alternative for Eclipse users. And no, Eclipse cannot successfully build everything -- in fact, it sometimes puts the output in the wrong directory. But I've spent all the time I can afford on researching this and haven't come up with a better solution. Perhaps someone in our open source community will be able to help.

[lp:~pbeaman/akiban-persistit/eclipse-juno-happier]

343. By Peter Beaman on 2012-08-02

Fix minor formatting issues per review

344. By Peter Beaman on 2012-08-02

Merge from trunk and resolve conflicts

[Peter Beaman (pbeaman)]

With fixes and Nathan's previous consent, Approving this.

=== modified file 'pom.xml'
--- pom.xml	2012-08-01 23:17:15 +0000
+++ pom.xml	2012-08-02 01:59:18 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <project>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>com.akiban</groupId>
     <artifactId>akiban-persistit</artifactId>
     <version>3.1.4-SNAPSHOT</version>
     <packaging>jar</packaging>
-    
+
     <name>akiban-persistit</name>
     <inceptionYear>2005</inceptionYear>
     <url>http://www.akiban.com/akiban-persistit</url>
@@ -14,7 +14,7 @@
         <name>Akiban Technologies, Inc</name>
         <url>http://www.akiban.com</url>
     </organization>
-    
+
     <licenses>
         <license>
             <name>GNU Affero General Public License, version 3</name>
@@ -25,11 +25,11 @@
 
     <properties>
         <!-- this is the default version number, Jenkins job sets this to the official number -->
-        <BZR_REVISION></BZR_REVISION>
+        <BZR_REVISION />
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
-    
+
     <distributionManagement>
         <snapshotRepository>
             <id>akiban</id>
@@ -42,7 +42,7 @@
             <url>http://akiban.artifactoryonline.com/akiban/libs-releases-local</url>
         </repository>
     </distributionManagement>
-    
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -230,7 +230,7 @@
                             <key>__YEAR_SECTION__</key>
                             <defaultValue>2012</defaultValue>
                             <!-- [2005-2011]-2012 | 2012 -->
-                            <ensureMatch>20(05|06|07|08|09|10|11)\-2012|2012</ensureMatch> -->
+                            <ensureMatch>20(05|06|07|08|09|10|11)\-2012|2012</ensureMatch>
                         </headerSection>
                     </headerSections>
                     <aggregate>true</aggregate>
@@ -267,6 +267,62 @@
                 <version>2.6</version>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            build-helper-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.5,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>
+                                                reserve-network-port
+                                            </goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            rmic-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.0,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>rmic</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <reporting>