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

Merge remote-tracking branch 'eclipse/master' into feature_split_repo_into_api_impl

Browse Source
This commit is contained in:
Kai Zimmermann
2016-06-01 09:23:43 +02:00
parent 1881880cd9 7b20122f09
commit 4bea2ae1a5
2 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
hawkbit-ui/pom.xml
View File

@@ -8,8 +8,7 @@
http://www.eclipse.org/legal/epl-v10.html http://www.eclipse.org/legal/epl-v10.html
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
@@ -28,8 +27,8 @@
<configuration> <configuration>
<extraJvmArgs>-Xmx1g -Xss1024k</extraJvmArgs> <extraJvmArgs>-Xmx1g -Xss1024k</extraJvmArgs>
<!-- We are doing "inplace" gwt compilation but into subdir VAADIN/widgetsets --> <!-- We are doing "inplace" gwt compilation but into subdir VAADIN/widgetsets -->
<webappDirectory>${project.build.directory}/classes/VAADIN/widgetsets</webappDirectory> <webappDirectory>src/main/resources/VAADIN/widgetsets</webappDirectory>
<hostedWebapp>${project.build.directory}/classes/VAADIN/widgetsets</hostedWebapp> <hostedWebapp>src/main/resources/VAADIN/widgetsets</hostedWebapp>
<warSourceDirectory>src/main/resources</warSourceDirectory> <warSourceDirectory>src/main/resources</warSourceDirectory>
<noServer>true</noServer> <noServer>true</noServer>
<!-- Remove draftCompile when project is ready --> <!-- Remove draftCompile when project is ready -->
@@ -43,12 +42,12 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>process-classes</phase>
<configuration> <configuration>
<!-- if you don't specify any modules, the plugin will find them --> <!-- if you don't specify any modules, the plugin will find them -->
<!-- <modules> <module>com.vaadin.demo.mobilemail.gwt.ColorPickerWidgetSet</module> </modules> --> <!-- <modules> <module>com.vaadin.demo.mobilemail.gwt.ColorPickerWidgetSet</module> </modules> -->
</configuration> </configuration>
<goals> <goals>
<goal>clean</goal>
<goal>resources</goal> <goal>resources</goal>
<goal>update-theme</goal> <goal>update-theme</goal>
<goal>update-widgetset</goal> <goal>update-widgetset</goal>
@@ -58,29 +57,47 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<configuration> <executions>
<archive> <execution>
<index>true</index> <phase>process-classes</phase>
<manifest> <configuration>
<addClasspath>true</addClasspath> <target>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <copy todir="${project.build.directory}/classes/VAADIN/widgetsets">
</manifest> <fileset dir="${basedir}/src/main/resources/VAADIN/widgetsets" includes="**/*" />
<manifestEntries> </copy>
<Implementation-Title>CustomRenderers</Implementation-Title> </target>
<Vaadin-Package-Version>1</Vaadin-Package-Version> </configuration>
<Vaadin-Widgetsets>org.eclipse.hawkbit.ui.customrenderers.CustomRendererWidgetSet</Vaadin-Widgetsets> <goals>
</manifestEntries> <goal>run</goal>
</archive> </goals>
</configuration> </execution>
</plugin> </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<index>true</index>
<manifest>
<addClasspath>true</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Implementation-Title>CustomRenderers</Implementation-Title>
<Vaadin-Package-Version>1</Vaadin-Package-Version>
<Vaadin-Widgetsets>org.eclipse.hawkbit.ui.customrenderers.CustomRendererWidgetSet</Vaadin-Widgetsets>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
@@ -171,11 +188,11 @@
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId> <artifactId>vaadin-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-client</artifactId> <artifactId>vaadin-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-push</artifactId> <artifactId>vaadin-push</artifactId>
</dependency> </dependency>

1
pom.xml
View File

@@ -167,6 +167,7 @@
<exclude>**/*.sql</exclude> <exclude>**/*.sql</exclude>
<exclude>eclipse_codeformatter.xml</exclude> <exclude>eclipse_codeformatter.xml</exclude>
<exclude>**/addons.scss</exclude> <exclude>**/addons.scss</exclude>
<exclude>**/VAADIN/widgetsets/**</exclude>
</excludes> </excludes>
<mapping> <mapping>
<scss>JAVADOC_STYLE</scss> <scss>JAVADOC_STYLE</scss>