diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh index e3a361752a3..68e6f6bcb20 100755 --- a/configuration/buildAndUpdateProduct.sh +++ b/configuration/buildAndUpdateProduct.sh @@ -76,7 +76,7 @@ GWT_WORKERS=2 MAVEN_SETTINGS="$PROJECT_HOME/configuration/maven-settings.xml" MAVEN_SETTINGS_PROXY="$PROJECT_HOME/configuration/maven-settings-proxy.xml" -p2PluginRepository=$PROJECT_HOME/java/com.sap.$PROJECT_TYPE.feature.p2build/bin/products/raceanalysis.product.id/linux/gtk/$ARCH +p2PluginRepository=$PROJECT_HOME/java/com.sap.$PROJECT_TYPE.feature.p2build/target/products/raceanalysis.product.id/linux/gtk/$ARCH HAS_OVERWRITTEN_TARGET=0 TARGET_SERVER_NAME=$active_branch diff --git a/configuration/installPluginsForEclipseNeon.sh b/configuration/installPluginsForEclipseNeon.sh index 0bf80b77bf8..3e1d30fd860 100644 --- a/configuration/installPluginsForEclipseNeon.sh +++ b/configuration/installPluginsForEclipseNeon.sh @@ -51,4 +51,7 @@ updatePlugins http://download.eclipse.org/egit/updates org.eclipse.jgit.feature. echo "Installing latest version of Mylyn ..." updatePlugins http://download.eclipse.org/mylyn/releases/latest org.eclipse.mylyn_feature.feature.group,org.eclipse.mylyn.bugzilla_feature.feature.group,org.eclipse.mylyn.builds.feature.group,org.eclipse.mylyn.commons.feature.group,org.eclipse.mylyn.commons.identity.feature.group,org.eclipse.mylyn.commons.notifications.feature.group,org.eclipse.mylyn.commons.repositories.feature.group,org.eclipse.mylyn.commons.repositories.http.feature.group,org.eclipse.mylyn.context_feature.feature.group,org.eclipse.mylyn.discovery.feature.group,org.eclipse.mylyn.gerrit.feature.feature.group,org.eclipse.mylyn.git.feature.group,org.eclipse.mylyn.hudson.feature.group,org.eclipse.mylyn.java_feature.feature.group,org.eclipse.mylyn.monitor.feature.group,org.eclipse.mylyn.reviews.feature.feature.group,org.eclipse.mylyn.team_feature.feature.group,org.eclipse.mylyn.versions.feature.group,org.eclipse.mylyn.wikitext_feature.feature.group +echo "Installing SAP JVM Tools (profiler) ..." +installPlugins https://tools.hana.ondemand.com/neon com.sap.jvm.profiling.feature.group + echo "Installation completed!" diff --git a/configuration/maven-settings-proxy.xml b/configuration/maven-settings-proxy.xml index ea1eed64a10..1be7a488a6f 100644 --- a/configuration/maven-settings-proxy.xml +++ b/configuration/maven-settings-proxy.xml @@ -30,7 +30,7 @@ - -Dselenium.test.environment.configuration=ci-test-environment.xml + -Dselenium.test.environment.configuration=ci-test-environment.xml -Dmongo.dbName=winddbTest -DspatialWind=true diff --git a/java/com.sap.sailing.feature.p2build/pom.xml b/java/com.sap.sailing.feature.p2build/pom.xml index 470e73bdd11..d4025571115 100644 --- a/java/com.sap.sailing.feature.p2build/pom.xml +++ b/java/com.sap.sailing.feature.p2build/pom.xml @@ -13,17 +13,16 @@ eclipse-repository - - + target + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + false + + org.eclipse.tycho tycho-p2-director-plugin @@ -35,17 +34,8 @@ materialize-products - - - + diff --git a/java/com.sap.sailing.selenium.test/pom.xml b/java/com.sap.sailing.selenium.test/pom.xml old mode 100644 new mode 100755 index 51697aea7ab..bac467ca494 --- a/java/com.sap.sailing.selenium.test/pom.xml +++ b/java/com.sap.sailing.selenium.test/pom.xml @@ -1,280 +1,274 @@ - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sailing.selenium.test - eclipse-test-plugin + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.selenium.test + eclipse-test-plugin - - - -Djetty.home=${basedir}/../target/configuration/jetty -Djetty.port=8085 - - - - ${parameters.integration-tests} ${parameters.proxy} ${parameters.jetty} -Xmx1024m - - + + + -Djetty.home=${basedir}/../target/configuration/jetty -Djetty.port=8085 + + + + ${parameters.integration-tests} ${parameters.proxy} ${parameters.jetty} -Xmx1024m + + - - - - org.eclipse.tycho - target-platform-configuration - - - - - eclipse-feature - com.sap.sailing.feature - 0.0.0 - - - eclipse-feature - com.sap.sailing.feature.runtime - 0.0.0 - - - eclipse-plugin - com.sap.sailing.server.gateway.test.support - 0.0.0 - - - - - - - org.eclipse.tycho - tycho-surefire-plugin - - - true - - - - - integration-test - - test - - - ${skipTests} - - **/core/** - - - ${tycho.tests.argLine} - -consoleLog -console -clean - - raceanalysis.product - raceanalysis.application - - - - com.sap.sailing.server.gateway.test.support - 4 - true - - - com.sap.sse.filestorage - 3 - true - - - com.sap.sse.security - 3 - true - - - com.sap.sse.security.ui - 5 - true - - - com.sap.sse.security.userstore - 3 - true - - - com.sap.sse.security.userstore.mongodb - 3 - true - - - com.sap.sailing.ess40.resultimport - 3 - true - - - com.sap.sailing.freg.resultimport - 3 - true - - - com.sap.sse.gwt - 4 - true - - - com.sap.sailing.gwt.home - 5 - true - - - com.sap.sailing.gwt.ui - 4 - true - - - com.sap.sailing.kiworesultimport - 3 - true - - - - com.sap.sailing.server - 4 - true - - - com.sap.sailing.server.gateway - 4 - true - - - com.sap.sailing.server.replication - 4 - true - - - com.sap.sailing.www - 4 - true - - - com.sap.sailing.datamining.shared - 4 - true - - - com.sap.sailing.datamining - 4 - true - - - com.sap.sailing.domain.deckmanadapter - 4 - true - - - com.sap.sailing.domain.igtimiadapter - 4 - true - - - com.sap.sailing.xmlexport - 4 - true - - - org.eclipse.equinox.common - 2 - true - - - org.eclipse.equinox.simpleconfigurator - 2 - true - - - org.eclipse.jetty.continuation - 4 - true - - - org.eclipse.jetty.deploy - 4 - true - - - org.eclipse.jetty.http - 4 - true - - - org.eclipse.jetty.io - 4 - true - - - org.eclipse.jetty.jmx - 4 - true - - - org.eclipse.jetty.nested - 4 - true - - - org.eclipse.jetty.osgi.boot - 4 - true - - - org.eclipse.jetty.security - 4 - true - - - org.eclipse.jetty.server - 4 - true - - - org.eclipse.jetty.servlet - 4 - true - - - org.eclipse.jetty.util - 4 - true - - - org.eclipse.jetty.webapp - 4 - true - - - org.eclipse.jetty.xml - 4 - true - - - org.mortbay.jetty.util - 4 - true - - - - - - - - + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + eclipse-feature + com.sap.sailing.feature + 0.0.0 + + + eclipse-feature + com.sap.sailing.feature.runtime + 0.0.0 + + + eclipse-plugin + com.sap.sailing.server.gateway.test.support + 0.0.0 + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + true + true + + + + + integration-test + + test + + + ${skipTests} + ${skipTests} + + **/core/** + + + ${tycho.tests.argLine} + -consoleLog -console -clean + + raceanalysis.product + raceanalysis.application + + + + com.sap.sailing.server.gateway.test.support + 4 + true + + + com.sap.sse.filestorage + 3 + true + + + com.sap.sse.security + 3 + true + + + com.sap.sse.security.ui + 5 + true + + + com.sap.sse.security.userstore + 3 + true + + + com.sap.sse.security.userstore.mongodb + 3 + true + + + com.sap.sailing.ess40.resultimport + 3 + true + + + com.sap.sailing.freg.resultimport + 3 + true + + + com.sap.sse.gwt + 4 + true + + + com.sap.sailing.gwt.home + 5 + true + + + com.sap.sailing.gwt.ui + 4 + true + + + com.sap.sailing.kiworesultimport + 3 + true + + + com.sap.sailing.server + 4 + true + + + com.sap.sailing.server.gateway + 4 + true + + + com.sap.sailing.server.replication + 4 + true + + + com.sap.sailing.www + 4 + true + + + com.sap.sailing.datamining.shared + 4 + true + + + com.sap.sailing.datamining + 4 + true + + + com.sap.sailing.domain.deckmanadapter + 4 + true + + + com.sap.sailing.domain.igtimiadapter + 4 + true + + + com.sap.sailing.xmlexport + 4 + true + + + org.eclipse.equinox.common + 2 + true + + + org.eclipse.equinox.simpleconfigurator + 2 + true + + + org.eclipse.jetty.continuation + 4 + true + + + org.eclipse.jetty.deploy + 4 + true + + + org.eclipse.jetty.http + 4 + true + + + org.eclipse.jetty.io + 4 + true + + + org.eclipse.jetty.jmx + 4 + true + + + org.eclipse.jetty.nested + 4 + true + + + org.eclipse.jetty.osgi.boot + 4 + true + + + org.eclipse.jetty.security + 4 + true + + + org.eclipse.jetty.server + 4 + true + + + org.eclipse.jetty.servlet + 4 + true + + + org.eclipse.jetty.util + 4 + true + + + org.eclipse.jetty.webapp + 4 + true + + + org.eclipse.jetty.xml + 4 + true + + + org.mortbay.jetty.util + 4 + true + + + + + + + + diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml index 3dee603586e..ac0e2988613 100644 --- a/java/com.sap.sse.feature.runtime/feature.xml +++ b/java/com.sap.sse.feature.runtime/feature.xml @@ -1,406 +1,413 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - - [Enter License Description here.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/org.openqa.selenium.osgi/.classpath b/java/org.openqa.selenium.osgi/.classpath index ef16414bcb1..fa4e74ad28f 100644 --- a/java/org.openqa.selenium.osgi/.classpath +++ b/java/org.openqa.selenium.osgi/.classpath @@ -1,7 +1,7 @@ - + diff --git a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF index 7aa03e7e128..2e553ef9e41 100644 --- a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF +++ b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF @@ -38,7 +38,6 @@ Bundle-ClassPath: lib/apache-mime4j-0.6.jar, lib/testng-6.8.5.jar, lib/xalan-2.7.1.jar, lib/xercesImpl-2.10.0.jar, - lib/xml-apis-1.4.01.jar, selenium-java-2.40.0.jar, lib/guava-15.0.jar Bundle-Vendor: openqa @@ -61,6 +60,7 @@ Export-Package: com.google.common.annotations, com.google.common.xml, com.thoughtworks.selenium, com.thoughtworks.selenium.condition, + org.json, org.openqa.selenium, org.openqa.selenium.browserlaunchers, org.openqa.selenium.browserlaunchers.locators, @@ -93,5 +93,4 @@ Export-Package: com.google.common.annotations, org.openqa.selenium.support.events.internal, org.openqa.selenium.support.pagefactory, org.openqa.selenium.support.pagefactory.internal, - org.openqa.selenium.support.ui, - org.json + org.openqa.selenium.support.ui diff --git a/java/org.openqa.selenium.osgi/build.properties b/java/org.openqa.selenium.osgi/build.properties index 187121016ae..feea6148156 100644 --- a/java/org.openqa.selenium.osgi/build.properties +++ b/java/org.openqa.selenium.osgi/build.properties @@ -33,7 +33,6 @@ bin.includes = META-INF/,\ lib/testng-6.8.5.jar,\ lib/xalan-2.7.1.jar,\ lib/xercesImpl-2.10.0.jar,\ - lib/xml-apis-1.4.01.jar,\ lib/phantomjsdriver-1.1.0.jar,\ selenium-java-2.40.0.jar,\ lib/guava-15.0.jar diff --git a/java/org.openqa.selenium.osgi/lib/xml-apis-1.4.01.jar b/java/org.openqa.selenium.osgi/lib/xml-apis-1.4.01.jar deleted file mode 100644 index 46733464fc7..00000000000 Binary files a/java/org.openqa.selenium.osgi/lib/xml-apis-1.4.01.jar and /dev/null differ diff --git a/java/pom.xml b/java/pom.xml index d7777cb232c..c7edf4f8e07 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ Due to ECJ/JDT bugs it may fail depending on the Eclipse version tycho is based on (see Bugzilla: https://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=3859). --> - 0.21.0 + 1.0.0 2.8.0 2.8.0 2 diff --git a/settings.xml b/settings.xml index 2f7ac254d4e..bbc6664a41f 100644 --- a/settings.xml +++ b/settings.xml @@ -23,7 +23,7 @@ sailing.analytics - + true diff --git a/wiki/howto/onboarding.md b/wiki/howto/onboarding.md index a32a927b66c..8eed546c867 100644 --- a/wiki/howto/onboarding.md +++ b/wiki/howto/onboarding.md @@ -8,7 +8,7 @@ First of all, make sure you've looked at http://www.amazon.de/Patterns-Elements- #### Installations -1. Eclipse (Eclipse IDE for Eclipse Committers, e.g. version 4.5.2 "Mars SR2"), http://www.eclipse.org +1. Eclipse (Eclipse IDE for Eclipse Committers, e.g. version 4.5.2 "Neon SR2"), http://www.eclipse.org 2. Eclipse Extensions * Install GWT Eclipse plugin for Eclipse (https://github.com/gwt-plugins/gwt-eclipse-plugin/tree/gpe-fork using http://storage.googleapis.com/gwt-eclipse-plugin/release as the update site URL) * Install Eclipse debugger for GWT SuperDevMode (master version: http://p2.sapsailing.com/p2/sdbg; public release: http://sdbg.github.io/p2) @@ -23,9 +23,9 @@ First of all, make sure you've looked at http://www.amazon.de/Patterns-Elements- #### Automatic Eclipse plugin installation -The necessary Eclipse plugins described above can be automatically be installed into a newly unzipped version of [Eclipse IDE for Eclipse Committers 4.5.2 "Mars SR2"](http://www.eclipse.org/downloads/packages/eclipse-ide-eclipse-committers-452/mars2) by using the script "configuration/installPluginsForEclipseMars.sh". In addition, the script applies some updates to plugins packaged with Eclipse itself. To start the plugin installation, run the following command using your Eclipse installation directory as command line parameter for the script: +The necessary Eclipse plugins described above can be automatically be installed into a newly unzipped version of [Eclipse IDE for Eclipse Committers 4.6.2 "Neon.2"](http://www.eclipse.org/downloads/packages/eclipse-ide-eclipse-committers/neon2) by using the script "configuration/installPluginsForEclipseNeon.sh". In addition, the script applies some updates to plugins packaged with Eclipse itself. To start the plugin installation, run the following command using your Eclipse installation directory as command line parameter for the script: - ./installPluginsForEclipseMars.sh "/some/path/on/my/computer/eclipse" + ./installPluginsForEclipseLuna.sh "/some/path/on/my/computer/eclipse" Be aware that with this script it's not possible to update the plugins to newer versions. Instead you can install a new version by unpacking the base package and executing the script. @@ -35,9 +35,6 @@ On Mac OS, it's not sufficient to provide the path to the app, instead you need Be aware hat the installation may take several minutes depending on your Internet connection. When the script finished running, please check that no errors occurred (the installation process only logs errors but doesn't fail). -__NOTE:__ -Beside the installation script for Eclipse Mars, there is also one for the new Eclipse Neon release (4.6.0). Due to a ECJ/JDT regression, this version will brake project functionality. If you've already installed Eclipse Neon, you can easily downgrade to Mars SR2, reusing your existing workspace. You just have to accept the warning you'll get during first startup and perform a workspace cleanup (`Project > Clean... > Clean all projects`). In rare cases, the target platform must be set again. - #### Further optional but recommended installations 1. Cygwin, http://www.cygwin.com/