From 51d051eadd4a6257d8e457213ab4f7c07e8bd5d5 Mon Sep 17 00:00:00 2001
From: Corey <cdaley@redhat.com>
Date: Tue, 1 Apr 2014 21:27:42 -0400
Subject: [PATCH] [OSJC-106] Correcting maven error in eclipse and formatting

---
 pom.xml | 119 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce89e7db..2c675471 100755
--- a/pom.xml
+++ b/pom.xml
@@ -66,56 +66,58 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-		<plugins>
-			<!-- read integration test properties -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>properties-maven-plugin</artifactId>
-				<version>1.0-alpha-1</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<goals>
-							<goal>read-project-properties</goal>
-						</goals>
-						<configuration>
-							<files>
-								<file>${integrationtest.properties}</file>
-							</files>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12</version>
-				<configuration>
-			        <argLine>-Dfile.encoding=UTF-8</argLine>
-					<systemPropertyVariables>
-						<libra_server>${libra_server}</libra_server>
-						<default_rhlogin>${default_rhlogin}</default_rhlogin>
-						<rhpassword>${rhpassword}</rhpassword>
-						<https.proxyHost>${proxyHost}</https.proxyHost>
-						<https.proxyPort>${proxyPort}</https.proxyPort>
-						<http.proxyHost>${proxyHost}</http.proxyHost>
-						<http.proxyPort>${proxyPort}</http.proxyPort>
-          			</systemPropertyVariables>
-					<excludes>
-						<exclude>**/OpenShiftIntegrationTestSuite.java</exclude>
-					</excludes>
-					<includes>
-						<include>**/OpenShiftTestSuite.java</include>
-					</includes>
-					<!--excludes> <exclude>**/OpenShiftTestSuite.java</exclude> </excludes> 
-						<includes> <include>**/OpenShiftIntegrationTestSuite.java</include> </includes -->
-					<!--jvm>/usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java</jvm -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!-- read integration test properties -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0-alpha-1</version>
+					<executions>
+						<execution>
+							<phase>initialize</phase>
+							<goals>
+								<goal>read-project-properties</goal>
+							</goals>
+							<configuration>
+								<files>
+									<file>${integrationtest.properties}</file>
+								</files>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.12</version>
+					<configuration>
+						<argLine>-Dfile.encoding=UTF-8</argLine>
+						<systemPropertyVariables>
+							<libra_server>${libra_server}</libra_server>
+							<default_rhlogin>${default_rhlogin}</default_rhlogin>
+							<rhpassword>${rhpassword}</rhpassword>
+							<https.proxyHost>${proxyHost}</https.proxyHost>
+							<https.proxyPort>${proxyPort}</https.proxyPort>
+							<http.proxyHost>${proxyHost}</http.proxyHost>
+							<http.proxyPort>${proxyPort}</http.proxyPort>
+						</systemPropertyVariables>
+						<excludes>
+							<exclude>**/OpenShiftIntegrationTestSuite.java</exclude>
+						</excludes>
+						<includes>
+							<include>**/OpenShiftTestSuite.java</include>
+						</includes>
+						<!--excludes> <exclude>**/OpenShiftTestSuite.java</exclude> </excludes> 
+							<includes> <include>**/OpenShiftIntegrationTestSuite.java</include> </includes -->
+						<!--jvm>/usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java</jvm -->
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.4</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 	<dependencies>
@@ -253,20 +255,20 @@
 								<libra_server>${libra_server}</libra_server>
 								<default_rhlogin>${default_rhlogin}</default_rhlogin>
 								<rhpassword>${rhpassword}</rhpassword>
-                <https.proxyHost>${proxyHost}</https.proxyHost>
-                <https.proxyPort>${proxyPort}</https.proxyPort>
-                <http.proxyHost>${proxyHost}</http.proxyHost>
-                <http.proxyPort>${proxyPort}</http.proxyPort>
-                <proxyHost>${proxyHost}</proxyHost>
-                <proxyPort>${proxyPort}</proxyPort>
-              </systemPropertyVariables>
+								<https.proxyHost>${proxyHost}</https.proxyHost>
+								<https.proxyPort>${proxyPort}</https.proxyPort>
+								<http.proxyHost>${proxyHost}</http.proxyHost>
+								<http.proxyPort>${proxyPort}</http.proxyPort>
+								<proxyHost>${proxyHost}</proxyHost>
+								<proxyPort>${proxyPort}</proxyPort>
+							</systemPropertyVariables>
 							<excludes>
 								<exclude>**/OpenShiftSuite.java</exclude>
 							</excludes>
 							<includes>
 								<include>**/OpenShiftIntegrationTestSuite.java</include>
 							</includes>
-              <forkMode>none</forkMode>
+							<forkMode>none</forkMode>
 						</configuration>
 						<executions>
 							<execution>
@@ -290,6 +292,5 @@
 				</plugins>
 			</build>
 		</profile>
-
 	</profiles>
 </project>