eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-02 17:19:37 +00:00
Code Activity

Merge branch 'master' into dataMining

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
This commit is contained in:
Lennart Hensler committed 2013-10-23 14:10:07 +02:00
2 parents 17e01ac5e1 cbc244175a
commit 7dad61c471
129 files changed
+5037 -3286
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/pom.xml
+7 -4
View File
@@ -9,13 +9,16 @@
</parent>
<artifactId>com.sap.sailing.gwt.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<gwt.version>2.5.1</gwt.version>
</properties>
<dependencies>
<dependency>
<!-- This dependency is required because the GWT Maven Plugin searches other GWT modules only in Maven dependencies -->
<groupId>com.google.code</groupId>
<artifactId>gwt-maps</artifactId>
<version>1.1.0</version>
<groupId>com.github.branflake2267</groupId>
<artifactId>gwt-maps-api</artifactId>
<version>3.9.0-build-17</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -87,7 +90,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>2.5.1</version>
<version>${gwt.version}</version>
<executions>
<execution>
<configuration combine.self="override">