Merge remote-tracking branch 'origin/master'

holdenk · Mar 3, 2012 · 825cd21 · 825cd21
2 parents c68e3e6 + 332f35d
commit 825cd21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@
 /target
 .DS_Store
 *.iml
+/.settings
+/.project
+/.classpath
diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.2</version>
+                <version>2.3</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>${project.build.directory}/releases/</outputDirectory>