From 182be488d5952dfabbd6b7a27997d2da6c18c60e Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Wed, 28 May 2014 12:25:22 +0200
Subject: [PATCH] Maven plugin version update, gitignore cleanup

---
 .gitignore | 24 +++++++++++++++++++++---
 pom.xml    |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a384e0e..2fbfc9c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,28 @@
+# IntelliJ
+.idea/
+*.iws
+*.iml
+*.ipr
+*.ips
+.idea/
+
+
+# Eclipse
+.settings/
+.metadata/
+.classpath
+.project
+
+# Generated
 target/
 javadoc/
 bin/
-.classpath
-.project
-.settings/
+log/
+
+# Misc.
 .DS_Store
+
+# Sample images
 *.png
 *.jpg
 *.bmp
diff --git a/pom.xml b/pom.xml
index 99cd9066..174e118f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.4</version>
+						<version>1.5</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
-- 
GitLab