From 91058b31d77ef9625f9ae975676eb54fa861bf92 Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Tue, 5 Apr 2011 01:17:54 -0400
Subject: [PATCH] configured Maven JAR plugin to us the Bundlor generated
 MANIFEST.MF for distributed jars; cleaned up formatting of poms

---
 spring-data-graph-parent/pom.xml |   8 ++
 spring-data-neo4j/pom.xml        | 144 +++++++++++++++----------------
 2 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index 0f6ff8068..40f0bc552 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -353,6 +353,14 @@
 					<junitArtifactName>junit:junit</junitArtifactName>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<useDefaultManifestFile>true</useDefaultManifestFile>
+				</configuration>
+			</plugin>
 			<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index cd4b11118..e198c19fd 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -39,17 +39,16 @@
 			<artifactId>spring-data-graph-core</artifactId>
 		</dependency>
 
-
-        <dependency>
-            <groupId>org.ow2.jotm</groupId>
-            <artifactId>jotm-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.spec.ee</groupId>
-            <artifactId>ow2-connector-1.5-spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.ow2.jotm</groupId>
+			<artifactId>jotm-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.spec.ee</groupId>
+			<artifactId>ow2-connector-1.5-spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- Logging -->
 		<dependency>
@@ -124,59 +123,57 @@
 			<artifactId>neo4j</artifactId>
 		</dependency>
 
-        <dependency>
-          <groupId>org.neo4j</groupId>
-          <artifactId>neo4j-kernel</artifactId>
-          <classifier>tests</classifier>
-          <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-kernel</artifactId>
+			<classifier>tests</classifier>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-          <groupId>org.neo4j</groupId>
-          <artifactId>server-api</artifactId>
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>server-api</artifactId>
 		 <scope>provided</scope>
-        </dependency>
+		</dependency>
 
-        <dependency>
-          <groupId>commons-configuration</groupId>
-          <artifactId>commons-configuration</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+		</dependency>
 
 		<!-- JPA -->
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <version>1.0.0.Final</version>
-        </dependency>
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<version>1.0.0.Final</version>
+		</dependency>
 
 		<!-- For Tests -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>3.5.5-Final</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.8.0.10</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.0.0.GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>4.0.2.GA</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>3.5.5-Final</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.10</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.0.2.GA</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-
-
-    </dependencies>
 	<repositories>
 		<repository>
 			<id>neo4j-public-repository</id>
@@ -185,7 +182,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-        </repository>
+		</repository>
 		<repository>
 			<id>jboss-repository</id>
 			<name>JBoss Public Repository</name>
@@ -198,7 +195,7 @@
 			</snapshots>
 			<name>Springframework Maven SNAPSHOT Repository</name>
 			<url>http://maven.springframework.org/snapshot</url>
-        </repository>
+		</repository>
 	</repositories>
 	<build>
 		<plugins>
@@ -238,22 +235,21 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-            <plugin>
-                   <groupId>org.apache.maven.plugins</groupId>
-                   <artifactId>maven-jar-plugin</artifactId>
-                   <version>2.2</version>
-                   <executions>
-                     <execution>
-                       <goals>
-                         <goal>test-jar</goal>
-                       </goals>
-                     </execution>
-                   </executions>
-                 </plugin>
-                    <plugin>
-                        <groupId>com.springsource.bundlor</groupId>
-                        <artifactId>com.springsource.bundlor.maven</artifactId>
-                    </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
 
 		</plugins>
 	</build>