lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/master'

Browse Source
This commit is contained in:
Kai Zimmermann
2016-01-22 14:14:16 +01:00
parent e6041c3b0f f5ae40ac17
commit ad04d9b479
1 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pom.xml
View File

@@ -127,26 +127,26 @@
<build>
<plugins>
<plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.11</version>
<configuration>
<header>LICENCE_HEADER_TEMPLATE.txt</header>
<excludes>
<exclude>**/README</exclude>
<exclude>3rd-dependencies/**</exclude>
<exclude>**/.git*</exclude>
<exclude>.git*</exclude>
<exclude>**/*.sql</exclude>
<exclude>**/*.sql</exclude>
<exclude>eclipse_codeformatter.xml</exclude>
</excludes>
<mapping>
<scss>JAVADOC_STYLE</scss>
</mapping>
<header>LICENCE_HEADER_TEMPLATE.txt</header>
<excludes>
<exclude>**/README</exclude>
<exclude>3rd-dependencies/**</exclude>
<exclude>**/.git*</exclude>
<exclude>.git*</exclude>
<exclude>**/*.sql</exclude>
<exclude>**/*.sql</exclude>
<exclude>eclipse_codeformatter.xml</exclude>
</excludes>
<mapping>
<scss>JAVADOC_STYLE</scss>
</mapping>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
@@ -189,6 +189,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -348,9 +360,10 @@
<artifactId>vaadin-push</artifactId>
<version>${vaadin.version}</version>
</dependency>
<!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). For widgetset compilation,
vaadin-client-compiler is automatically added on the compilation classpath by vaadin-maven-plugin so normally there is no
need for an explicit dependency. -->
<!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
For widgetset compilation, vaadin-client-compiler is automatically added
on the compilation classpath by vaadin-maven-plugin so normally there is
no need for an explicit dependency. -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiler</artifactId>
@@ -488,7 +501,8 @@
</exclusion>
</exclusions>
</dependency>
<!-- Override of classmate version, that is a hibernate validator dependency. allow PB of CQ -->
<!-- Override of classmate version, that is a hibernate validator
dependency. allow PB of CQ -->
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>