More warning polishing

hyperic · Apr 29, 2010 · b249977 · b249977
1 parent ba0cbe1
commit b249977
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-.DS_Store
 target
 .classpath
 .project

diff --git a/hqapi1-client/pom.xml b/hqapi1-client/pom.xml
@@ -24,15 +24,6 @@
 						<descriptor>src/main/assembly/assembly.xml</descriptor>
 					</descriptors>
 				</configuration>
-				<executions>
-					<execution>
-						<id>package</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>

diff --git a/hqapi1-plugin/pom.xml b/hqapi1-plugin/pom.xml
@@ -24,15 +24,6 @@
 						<descriptor>src/main/assembly/assembly.xml</descriptor>
 					</descriptors>
 				</configuration>
-				<executions>
-					<execution>
-						<id>package</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -11,6 +11,8 @@
 	<name>Hyperic HQAPI - Parent</name>
 
 	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
 		<clover.version>3.0.1</clover.version>
 		<commons-logging.version>1.0.4</commons-logging.version>
 		<httpclient.version>3.1</httpclient.version>
@@ -54,21 +56,21 @@
 				<artifactId>wadl-core</artifactId>
 				<version>${wadl.version}</version>
 			</dependency>
-		    <dependency>
-		        <groupId>org.springframework</groupId>
-		        <artifactId>spring-context</artifactId>
-			    <version>${spring.version}</version>
-		   </dependency>
-		   <dependency>
-	            <groupId>javax.xml.bind</groupId>
-	            <artifactId>jaxb-api</artifactId>
-	            <version>${jaxb.version}</version>
-	        </dependency>
-	        <dependency>
-	            <groupId>javax.xml</groupId>
-	            <artifactId>jaxb-impl</artifactId>
-	            <version>${jaxb.version}</version>
-	        </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>${jaxb.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml</groupId>
+				<artifactId>jaxb-impl</artifactId>
+				<version>${jaxb.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -88,6 +90,22 @@
 					<artifactId>wadl-maven-plugin</artifactId>
 					<version>${wadl.version}</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.2-beta-5</version>
+					<configuration>
+						<tarLongFileMode>gnu</tarLongFileMode>
+					</configuration>
+					<executions>
+						<execution>
+							<id>package</id>
+							<phase>package</phase>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<plugin>
 					<groupId>com.atlassian.maven.plugins</groupId>
 					<artifactId>maven-clover2-plugin</artifactId>