From bd2b973b0880a34785b38f89a0b90a579c9b2e49 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 1 Sep 2014 22:11:48 +0200
Subject: [PATCH] added version to maven plugin
---
.classpath | 4 +--
.settings/org.eclipse.core.resources.prefs | 2 ++
pom.xml | 31 +++++++++++-----------
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/.classpath b/.classpath
index eab1b08c..fd5d7e13 100644
--- a/.classpath
+++ b/.classpath
@@ -13,8 +13,8 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="conf"/>
- <classpathentry kind="src" path="src/test/resources"/>
- <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index f9fe3459..29abf999 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index 7cc17c4b..9a416c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
@@ -101,21 +102,21 @@
<version>2.5</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName>
- </configuration>
- </plugin>
+<!-- <plugin> -->
+<!-- <groupId>org.apache.maven.plugins</groupId> -->
+<!-- <artifactId>maven-shade-plugin</artifactId> -->
+<!-- <executions> -->
+<!-- <execution> -->
+<!-- <phase>package</phase> -->
+<!-- <goals> -->
+<!-- <goal>shade</goal> -->
+<!-- </goals> -->
+<!-- </execution> -->
+<!-- </executions> -->
+<!-- <configuration> -->
+<!-- <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
</plugins>
</build>
</project>
--
GitLab