Merge remote-tracking branch 'eclipse/master' into cleanup-properties

# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
This commit is contained in:
Kai Zimmermann
2016-03-04 12:11:35 +01:00
53 changed files with 1321 additions and 828 deletions

View File

@@ -220,7 +220,7 @@
<plugin>
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
<version>1.1-SNAPSHOT</version>
<version>2.6.2</version>
<executions>
<execution>
<phase>process-classes</phase>