diff --git a/.gitignore b/.gitignore index 3bb167e6a2f..ffed4b19862 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,4 @@ out/ .gradle local.properties git.xml -build.info mobile/github-advrecyclerview_lib/bin diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh index 3c3fcc0d0a0..1627b8b21dc 100755 --- a/configuration/buildAndUpdateProduct.sh +++ b/configuration/buildAndUpdateProduct.sh @@ -5,7 +5,7 @@ set -o functrace # and is used to correctly resolve bundle names PROJECT_TYPE="sailing" -find_project_home () +find_project_home () { if [[ "$1" == '/' ]] || [[ "$1" == "" ]]; then echo "" @@ -173,7 +173,7 @@ do u) suppress_confirmation=1;; v) p2local=1;; x) GWT_WORKERS=$OPTARG;; - j) TESTCASE_TO_EXECUTE=$OPTARG;; + j) TESTCASE_TO_EXECUTE=$OPTARG;; \?) echo "Invalid option" exit 4;; esac @@ -306,11 +306,11 @@ MEMORY=4096m REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl INSTALL_FROM_RELEASE=$SIMPLE_VERSION_INFO " >> $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO/amazon-launch-config_replica.txt - + `which tar` cvzf $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO/$SIMPLE_VERSION_INFO.tar.gz * cp $ACDIR/env.sh $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO cp $PROJECT_HOME/build/release-notes.txt $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO - + cd $PROJECT_HOME rm -rf build/* @@ -322,7 +322,7 @@ INSTALL_FROM_RELEASE=$SIMPLE_VERSION_INFO echo "Checking the remote connection..." REMOTE_HOME=`ssh $REMOTE_SERVER_LOGIN 'echo $HOME/releases'` echo "Now uploading release to $REMOTE_SERVER_LOGIN:$REMOTE_HOME. Can take quite a while!" - + `which scp` -r $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO $REMOTE_SERVER_LOGIN:$REMOTE_HOME/ echo "Uploaded release to $REMOTE_HOME! Make sure to also put an updated env.sh if needed to the right place ($REMOTE_HOME/environment in most cases)" fi @@ -607,7 +607,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then if [ $android -eq 0 ] && [ $gwtcompile -eq 0 ] && [ $testing -eq 0 ]; then parallelexecution=1 echo "INFO: Running build in parallel with 2.5*CPU threads" - extra="$extra -T 2.5C" + extra="$extra -T 2.5C" fi if [ $android -eq 1 ]; then @@ -620,22 +620,32 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then PATH=$PATH:$ANDROID_HOME/tools PATH=$PATH:$ANDROID_HOME/platform-tools ANDROID="$ANDROID_HOME/tools/android" - if [ \! -x "$ANDROID" ]; then - ANDROID="$ANDROID_HOME/tools/android.bat" - fi + if [ \! -x "$ANDROID" ]; then + ANDROID="$ANDROID_HOME/tools/android.bat" + fi + + mobile_extra="-P -with-not-android-relevant -P with-mobile" + + if [ $testing -eq 0 ]; then + echo "INFO: Skipping tests" + mobile_extra="$mobile_extra -Dmaven.test.skip=true -DskipTests=true" + else + mobile_extra="$mobile_extra -DskipTests=false" + fi - RC_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.racecommittee.app/build.gradle | cut -d "=" -f 2` + RC_APP_VERSION=`grep "android:versionCode=" mobile/com.sap.$PROJECT_TYPE.racecommittee.app/AndroidManifest.xml | cut -d "\"" -f 2` echo "RC_APP_VERSION=$RC_APP_VERSION" - extra="$extra -Drc-app-version=$RC_APP_VERSION" - TRACKING_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.android.tracking.app/build.gradle | cut -d "=" -f 2` + TRACKING_APP_VERSION=`grep "android:versionCode=" mobile/com.sap.$PROJECT_TYPE.android.tracking.app/AndroidManifest.xml | cut -d "\"" -f 2` echo "TRACKING_APP_VERSION=$TRACKING_APP_VERSION" - extra="$extra -Dtracking-app-version=$TRACKING_APP_VERSION" - BUOY_APP_VERSION=`grep "def verCode=" mobile/com.sap.$PROJECT_TYPE.buoy.positioning/build.gradle | cut -d "=" -f 2` + BUOY_APP_VERSION=`grep "android:versionCode=" mobile/com.sap.$PROJECT_TYPE.buoy.positioning/AndroidManifest.xml | cut -d "\"" -f 2` echo "BUOY_APP_VERSION=$BUOY_APP_VERSION" - extra="$extra -Dbuoy-app-version=$BUOY_APP_VERSION" - + + APP_VERSION_PARAMS="-Drc-app-version=$RC_APP_VERSION -Dtracking-app-version=$TRACKING_APP_VERSION -Dbuoy.positioning-app-version=$BUOY_APP_VERSION" + extra="$extra $APP_VERSION_PARAMS" + mobile_extra="$mobile_extra $APP_VERSION_PARAMS" + NOW=$(date +"%s") BUILD_TOOLS=22.0.1 TARGET_API=22 @@ -654,16 +664,19 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then echo yes | "$ANDROID" update sdk $ANDROID_OPTIONS --filter extra-android-m2repository --no-ui --force --all > /dev/null echo "Updating Android SDK (extra-google-m2repository)..." | tee -a $START_DIR/build.log echo yes | "$ANDROID" update sdk $ANDROID_OPTIONS --filter extra-google-m2repository --no-ui --force --all > /dev/null - ./gradlew clean build -xtest | tee -a $START_DIR/build.log + + echo "Using following command for apps build: mvn $mobile_extra -DargLine=\"$APP_PARAMETERS\" -fae -s $MAVEN_SETTINGS $clean install" + echo "Maven version used: `mvn --version`" + mvn $mobile_extra -DargLine="$APP_PARAMETERS" -fae -s $MAVEN_SETTINGS $clean install 2>&1 | tee -a $START_DIR/build.log if [[ ${PIPESTATUS[0]} != 0 ]]; then exit 100 fi if [ $testing -eq 1 ]; then echo "Starting JUnit tests..." - ./gradlew test | tee -a $START_DIR/build.log - if [[ ${PIPESTATUS[0]} != 0 ]]; then - exit 103 - fi + # ./gradlew test | tee -a $START_DIR/build.log + # if [[ ${PIPESTATUS[0]} != 0 ]]; then + # exit 103 + # fi # TODO find a way that the emulator test is stable in hudson # adb emu kill # echo "Downloading image (sys-img-${ANDROID_ABI}-android-${TEST_API})..." | tee -a $START_DIR/build.log @@ -690,9 +703,6 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then # adb emu kill # "$ANDROID" delete avd --name ${AVD_NAME} fi - else - echo "INFO: Deactivating mobile modules" - extra="$extra -P !with-mobile" fi if [ $reporting -eq 1 ]; then @@ -704,6 +714,8 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then # needed to make sure that tests use the right servers APP_PARAMETERS="-Dmongo.host=$MONGODB_HOST -Dmongo.port=$MONGODB_PORT -Dexpedition.udp.port=$EXPEDITION_PORT -Dreplication.exchangeHost=$REPLICATION_HOST -Dreplication.exchangeName=$REPLICATION_CHANNEL" + extra="$extra -P with-not-android-relevant,!with-mobile" + echo "Using following command: mvn $extra -DargLine=\"$APP_PARAMETERS\" -fae -s $MAVEN_SETTINGS $clean install" echo "Maven version used: `mvn --version`" mvn $extra -DargLine="$APP_PARAMETERS" -fae -s $MAVEN_SETTINGS $clean install 2>&1 | tee -a $START_DIR/build.log @@ -888,13 +900,13 @@ if [[ "$@" == "remote-deploy" ]]; then $SCP_CMD $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/jetty/etc $SCP_CMD $PROJECT_HOME/java/target/configuration/monitoring.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/ $SCP_CMD $PROJECT_HOME/java/target/configuration/mail.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/ - + $SCP_CMD $PROJECT_HOME/java/target/env.sh $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ $SCP_CMD $PROJECT_HOME/java/target/start $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ $SCP_CMD $PROJECT_HOME/java/target/stop $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ $SCP_CMD $PROJECT_HOME/java/target/status $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ $SCP_CMD $PROJECT_HOME/java/target/udpmirror $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ - + $SCP_CMD $PROJECT_HOME/java/target/http2udpmirror $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/ $SCP_CMD $PROJECT_HOME/java/target/configuration/logging.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/ fi diff --git a/install-android-sdk/pom.xml b/install-android-sdk/pom.xml new file mode 100644 index 00000000000..4799877938c --- /dev/null +++ b/install-android-sdk/pom.xml @@ -0,0 +1,109 @@ + + + 4.0.0 + + + workspace + com.sap.sailing + 1.0.0-SNAPSHOT + + + install-android-sdk + pom + + + + + install-android-sdk-windows + + + ${ldi.android.sdk.location}/platform-tools/adb.exe + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install-android-sdk + initialize + + unpack + + + + + com.google.download.android + android-sdk-windows + ${ldi.download.android.sdk.version} + zip + false + ${ldi.android.sdk.parent.location} + **/* + + + com.google.download.android + platform-tools-windows + ${ldi.download.android.platform-tools.version} + zip + false + ${ldi.android.sdk.location} + **/* + + + com.google.download.android + build-tools-windows + ${ldi.download.android.build-tools.version} + zip + false + ${ldi.android.sdk.location}/build-tools + **/* + + + com.google.download.android + android + ${ldi.download.android.platform.version} + zip + false + ${ldi.android.sdk.location}/platforms + **/* + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + move_platform_dir + initialize + + + + + + + + + run + + + + + + + + + diff --git a/java/com.sap.sailing.dashboards.gwt/pom.xml b/java/com.sap.sailing.dashboards.gwt/pom.xml index ec9512cb84d..8fc863c9423 100644 --- a/java/com.sap.sailing.dashboards.gwt/pom.xml +++ b/java/com.sap.sailing.dashboards.gwt/pom.xml @@ -40,7 +40,7 @@ com.sap.sailing com.sap.sailing.gwt.ui - 1.0.0-SNAPSHOT + ${project.version} sources @@ -52,37 +52,37 @@ com.sap.sailing com.sap.sailing.domain.common - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.common - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.gwt - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.gwt.adminconsole - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sailing.datamining.shared - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.datamining.shared - 1.0.0-SNAPSHOT + ${project.version} sources diff --git a/java/com.sap.sailing.domain.common/AndroidManifest.xml b/java/com.sap.sailing.domain.common/AndroidManifest.xml new file mode 100644 index 00000000000..0e90833060d --- /dev/null +++ b/java/com.sap.sailing.domain.common/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sailing.domain.common/pom.xml b/java/com.sap.sailing.domain.common/pom.xml index a1ae29ff16f..493effbd498 100755 --- a/java/com.sap.sailing.domain.common/pom.xml +++ b/java/com.sap.sailing.domain.common/pom.xml @@ -1,40 +1,62 @@ - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sailing.domain.common - eclipse-plugin - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - 1.7 - 1.7 - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - generate-sources - - plugin-source - - - - - - + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.domain.common + eclipse-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + 1.7 + 1.7 + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml b/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml new file mode 100644 index 00000000000..0e90833060d --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sailing.domain.shared.android/pom.xml b/java/com.sap.sailing.domain.shared.android/pom.xml index af7117f708a..faa8527098a 100644 --- a/java/com.sap.sailing.domain.shared.android/pom.xml +++ b/java/com.sap.sailing.domain.shared.android/pom.xml @@ -1,39 +1,63 @@ - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sailing.domain.shared.android - eclipse-plugin - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - 1.7 - 1.7 - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - generate-sources - - plugin-source - - - - - - + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.domain.shared.android + eclipse-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + 1.7 + 1.7 + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.3.0 + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sailing.gwt.ui/pom.xml b/java/com.sap.sailing.gwt.ui/pom.xml index 47a3ef69008..15b9d9baf75 100755 --- a/java/com.sap.sailing.gwt.ui/pom.xml +++ b/java/com.sap.sailing.gwt.ui/pom.xml @@ -1,211 +1,210 @@ - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sailing.gwt.ui - eclipse-plugin + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.gwt.ui + eclipse-plugin - + - - com.google.gwt - gwt-user - ${gwt.version} - - - com.google.gwt - gwt-dev - ${gwt.version} - - - javax.validation - validation-api - 1.0.0.GA - - - javax.validation - validation-api - 1.0.0.GA - sources - - - - com.github.branflake2267 - gwt-maps-api - 3.9.0-build-17 - provided - - - org.moxieapps.gwt - org.moxieapps.gwt.highcharts - 1.6.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sailing.domain.common - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.common - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.gwt - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.gwt.theme - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.gwt.adminconsole - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sailing.datamining.shared - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.datamining.shared - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.datamining.annotations - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sailing.polars.datamining.shared - 1.0.0-SNAPSHOT - sources - - - com.github.gwtbootstrap - gwt-bootstrap - 2.3.2.0 - provided - - - com.sap.sailing - com.sap.sse.security.common - 1.0.0-SNAPSHOT - sources - - - com.sap.sailing - com.sap.sse.security.ui - 1.0.0-SNAPSHOT - sources - + + com.google.gwt + gwt-user + ${gwt.version} + + + com.google.gwt + gwt-dev + ${gwt.version} + + + javax.validation + validation-api + 1.0.0.GA + + + javax.validation + validation-api + 1.0.0.GA + sources + + + + com.github.branflake2267 + gwt-maps-api + 3.9.0-build-17 + provided + + + org.moxieapps.gwt + org.moxieapps.gwt.highcharts + 1.6.0-SNAPSHOT + sources + + + com.sap.sailing + com.sap.sailing.domain.common + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.common + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.gwt + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.gwt.theme + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.gwt.adminconsole + ${project.version} + sources + + + com.sap.sailing + com.sap.sailing.datamining.shared + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.datamining.shared + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.datamining.annotations + ${project.version} + sources + + + com.sap.sailing + com.sap.sailing.polars.datamining.shared + ${project.version} + sources + + + com.github.gwtbootstrap + gwt-bootstrap + 2.3.2.0 + provided + + + com.sap.sailing + com.sap.sse.security.common + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.security.ui + ${project.version} + sources + + - - - - - - org.codehaus.mojo - gwt-maven-plugin - ${gwt.version} - - - - - - - com.sap.sailing.gwt.home.Home - com.sap.sailing.gwt.AutoPlay - com.sap.sailing.gwt.ui.AdminConsole - com.sap.sailing.gwt.ui.Leaderboard - com.sap.sailing.gwt.ui.LeaderboardEditing - com.sap.sailing.gwt.ui.RaceBoard - com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart - com.sap.sailing.gwt.ui.Spectator - com.sap.sailing.gwt.ui.DataMining - com.sap.sailing.gwt.ui.VideoPopup - com.sap.sailing.gwt.ui.YoutubePopup - com.sap.sailing.gwt.ui.Simulator - com.sap.sailing.gwt.regattaoverview.RegattaOverview - + + + + org.codehaus.mojo + gwt-maven-plugin + ${gwt.version} + + + + + + + com.sap.sailing.gwt.home.Home + com.sap.sailing.gwt.AutoPlay + com.sap.sailing.gwt.ui.AdminConsole + com.sap.sailing.gwt.ui.Leaderboard + com.sap.sailing.gwt.ui.LeaderboardEditing + com.sap.sailing.gwt.ui.RaceBoard + com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart + com.sap.sailing.gwt.ui.Spectator + com.sap.sailing.gwt.ui.DataMining + com.sap.sailing.gwt.ui.VideoPopup + com.sap.sailing.gwt.ui.YoutubePopup + com.sap.sailing.gwt.ui.Simulator + com.sap.sailing.gwt.regattaoverview.RegattaOverview + - ${basedir}/.generated - ${basedir} - ${basedir}/src/main/resources - - - - compile - - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - generate-sources - - plugin-source - - - - - - + + + compile + + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + - - - debug.no-gwt-compile - - - - org.codehaus.mojo - gwt-maven-plugin - ${gwt.version} - - - - - - - - help - - - - - - - - + + + debug.no-gwt-compile + + + + org.codehaus.mojo + gwt-maven-plugin + ${gwt.version} + + + + + + + + help + + + + + + + + diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml b/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml new file mode 100644 index 00000000000..0e90833060d --- /dev/null +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml b/java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml index 6d3ec73f155..38a8b69b2e8 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml @@ -22,4 +22,26 @@ + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-empty.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-empty.target new file mode 100644 index 00000000000..55d324025d1 --- /dev/null +++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-empty.target @@ -0,0 +1,2 @@ + + diff --git a/java/com.sap.sailing.www/pom.xml b/java/com.sap.sailing.www/pom.xml index a558bb3be56..e7c4a6404fe 100644 --- a/java/com.sap.sailing.www/pom.xml +++ b/java/com.sap.sailing.www/pom.xml @@ -12,32 +12,4 @@ com.sap.sailing.www eclipse-plugin - - - - - - with-mobile - - true - - - - com.sap.sailing - com.sap.sailing.racecommittee.app - 1.0.0-SNAPSHOT - true - - - com.sap.sailing - com.sap.sailing.android.tracking.app - 1.0.0-SNAPSHOT - true - - - - - - diff --git a/java/com.sap.sse.common/AndroidManifest.xml b/java/com.sap.sse.common/AndroidManifest.xml new file mode 100644 index 00000000000..0e90833060d --- /dev/null +++ b/java/com.sap.sse.common/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sse.common/pom.xml b/java/com.sap.sse.common/pom.xml index e1006e659cc..eb918d91769 100644 --- a/java/com.sap.sse.common/pom.xml +++ b/java/com.sap.sse.common/pom.xml @@ -1,40 +1,63 @@ - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sse.common - eclipse-plugin + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sse.common + eclipse-plugin - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - 1.7 - 1.7 - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - generate-sources - - plugin-source - - - - - - + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + 1.7 + 1.7 + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sse.datamining.annotations/AndroidManifest.xml b/java/com.sap.sse.datamining.annotations/AndroidManifest.xml new file mode 100644 index 00000000000..df3874bb31e --- /dev/null +++ b/java/com.sap.sse.datamining.annotations/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sse.datamining.annotations/pom.xml b/java/com.sap.sse.datamining.annotations/pom.xml index 343b2434435..eef028bf898 100644 --- a/java/com.sap.sse.datamining.annotations/pom.xml +++ b/java/com.sap.sse.datamining.annotations/pom.xml @@ -28,4 +28,26 @@ + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sse.gwt.theme/pom.xml b/java/com.sap.sse.gwt.theme/pom.xml index eb3460c70c9..0d4158b33cc 100644 --- a/java/com.sap.sse.gwt.theme/pom.xml +++ b/java/com.sap.sse.gwt.theme/pom.xml @@ -25,13 +25,13 @@ com.sap.sailing com.sap.sse.common - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.gwt - 1.0.0-SNAPSHOT + ${project.version} sources diff --git a/java/com.sap.sse.security.common/AndroidManifest.xml b/java/com.sap.sse.security.common/AndroidManifest.xml new file mode 100644 index 00000000000..ece9aa1dac5 --- /dev/null +++ b/java/com.sap.sse.security.common/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sse.security.common/pom.xml b/java/com.sap.sse.security.common/pom.xml index 45259c58bad..e2a941ded0a 100755 --- a/java/com.sap.sse.security.common/pom.xml +++ b/java/com.sap.sse.security.common/pom.xml @@ -28,5 +28,26 @@ - + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/com.sap.sse.security.ui/pom.xml b/java/com.sap.sse.security.ui/pom.xml index a8b8b8f191f..b2d16ca0dfe 100644 --- a/java/com.sap.sse.security.ui/pom.xml +++ b/java/com.sap.sse.security.ui/pom.xml @@ -25,25 +25,25 @@ com.sap.sailing com.sap.sse.common - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.gwt - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.security - 1.0.0-SNAPSHOT + ${project.version} sources com.sap.sailing com.sap.sse.security.common - 1.0.0-SNAPSHOT + ${project.version} sources diff --git a/java/com.sap.sse.shared.android/AndroidManifest.xml b/java/com.sap.sse.shared.android/AndroidManifest.xml new file mode 100644 index 00000000000..6a4f36a7663 --- /dev/null +++ b/java/com.sap.sse.shared.android/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/com.sap.sse.shared.android/pom.xml b/java/com.sap.sse.shared.android/pom.xml index c7c009701cb..f0cc2953d8b 100644 --- a/java/com.sap.sse.shared.android/pom.xml +++ b/java/com.sap.sse.shared.android/pom.xml @@ -22,4 +22,26 @@ + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/org.json.simple/AndroidManifest.xml b/java/org.json.simple/AndroidManifest.xml new file mode 100644 index 00000000000..0e90833060d --- /dev/null +++ b/java/org.json.simple/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/java/org.json.simple/pom.xml b/java/org.json.simple/pom.xml index 5b842829851..7ae5dba2e94 100644 --- a/java/org.json.simple/pom.xml +++ b/java/org.json.simple/pom.xml @@ -1,40 +1,64 @@ - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - org.json.simple - 1.1.0-SNAPSHOT - eclipse-plugin - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - 1.7 - 1.7 - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - generate-sources - - plugin-source - - - - - - + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + org.json.simple + 1.1.0-SNAPSHOT + eclipse-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + 1.7 + 1.7 + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + + + + + with-mobile + + + ldi.releaseBuild + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + diff --git a/java/pom.xml b/java/pom.xml old mode 100755 new mode 100644 index bb6019ccf4f..880c89bf22c --- a/java/pom.xml +++ b/java/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -13,133 +13,17 @@ pom - com.sap.sse + com.sap.sse.common com.sap.sse.shared.android - com.sap.sse.mail - com.sap.sse.mail.replication.test - com.sap.sse.mail.replication.testsupport - com.sap.sse.mongodb - com.sap.sse.gwt - com.sap.sse.gwt.adminconsole - com.sap.sse.datamining com.sap.sse.datamining.annotations - com.sap.sse.datamining.shared - com.sap.sse.security com.sap.sse.security.common - com.sap.sse.security.ui - com.sap.sse.security.userstore.mongodb - com.sap.sse.operationaltransformation - com.sap.sse.replication - com.sap.sse.threadmanager - com.sap.sse.filestorage - com.sap.sse.gwt.theme + org.json.simple com.sap.sailing.domain.common com.sap.sailing.domain.shared.android - com.sap.sailing.domain - com.sap.sailing.geocoding - com.sap.sailing.datamining - com.sap.sailing.datamining.shared - com.sap.sailing.domain.persistence - com.sap.sailing.domain.deckmanadapter - com.sap.sailing.domain.tractracadapter - com.sap.sailing.domain.tractracadapter.persistence - com.sap.sailing.domain.igtimiadapter - com.sap.sailing.domain.igtimiadapter.persistence - com.sap.sailing.domain.racelogtrackingadapter - com.sap.sailing.domain.racelogtrackingadapter.testsupport - com.sap.sailing.domain.swisstimingadapter - com.sap.sailing.domain.swisstimingadapter.persistence - com.sap.sailing.domain.swisstimingreplayadapter - com.sap.sailing.news - com.sap.sailing.declination - com.sap.sailing.udpconnector - com.sap.sailing.expeditionconnector - com.sap.sailing.server - com.sap.sailing.server.gateway - com.sap.sailing.server.gateway.serialization com.sap.sailing.server.gateway.serialization.shared.android - com.sap.sailing.www - com.sap.sailing.www.events - com.sap.sailing.xmlexport - com.google.gwt.dev - com.google.gwt.osgi - com.tractrac.clientmodule - org.json.simple - com.googlecode.java-diff-utils - com.googlecode.mgwt - com.sap.sailing.dashboards.gwt - com.sap.sailing.feature - org.moxieapps.gwt.highcharts - com.sap.sailing.resultimport - com.sap.sailing.kiworesultimport - com.sap.sailing.ess40.resultimport - com.sap.sailing.xrr.schema - com.sap.sailing.xrr.resultimport - com.sap.sailing.xrr.structureimport - com.sap.sailing.freg.resultimport - org.openqa.selenium.osgi - com.sap.sailing.monitoring - com.sap.sailing.simulator - com.sap.sailing.server.trackfiles - com.sap.sailing.feature.runtime - com.sap.sailing.gwt.ui - com.sap.sailing.domain.test - com.sap.sse.replication.testsupport - - com.sap.sse.gwt.test - - com.sap.sse.datamining.test - com.sap.sse.security.replication.test - com.sap.sse.security.test - com.sap.sse.operationaltransformation.test - com.sap.sse.common.test - com.sap.sse.filestorage.test - com.sap.sailing.datamining.test - com.sap.sailing.domain.deckmanadapter.test - com.sap.sailing.domain.igtimiadapter.test - com.sap.sailing.domain.racelogtrackingadapter.test - com.sap.sailing.xmlexport.test - com.sap.sailing.xrr.resultimport.test - com.sap.sailing.domain.shared.android.test - com.sap.sailing.geocoding.test - com.sap.sailing.domain.swisstimingadapter.test - com.sap.sailing.domain.swisstimingreplayadapter.test - com.sap.sailing.declination.test - com.sap.sailing.expeditionconnector.test - com.sap.sailing.server.test - com.sap.sailing.server.gateway.test - com.sap.sailing.server.gateway.test.support - com.sap.sailing.server.gateway.serialization.test - com.sap.sailing.server.replication.test - com.sap.sailing.gwt.ui.test - com.sap.sailing.mongodb.test - com.googlecode.java-diff-utils.test - com.sap.sailing.kiworesultimport.test - com.sap.sailing.ess40.resultimport.test - com.sap.sailing.freg.resultimport.test - com.sap.sailing.barbados.resultimport - com.sap.sailing.barbados.resultimport.test - com.sap.sailing.velum.resultimport - com.sap.sailing.velum.resultimport.test - com.sap.sailing.sailwave.resultimport - com.sap.sailing.sailwave.resultimport.test - com.sap.sailing.manage2sail - com.sap.sailing.manage2sail.resultimport - com.sap.sailing.manage2sail.resultimport.test - com.sap.sailing.simulator.test - com.sap.sailing.server.trackfiles.test - com.sap.sailing.selenium.test - com.sap.sailing.autoload - com.sap.sailing.feature.p2build - com.sap.sailing.polars - com.sap.sailing.polars.datamining - com.sap.sailing.polars.datamining.shared - com.sap.sailing.polars.test - @@ -148,9 +32,9 @@ 2.7.0 2 race-analysis-p2-remote - + -Dfile.encoding=cp1252 -Dmongo.dbName=winddbTest -DspatialWind=true @@ -166,8 +50,8 @@ -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y - + -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy.wdf.sap.corp -Dhttps.proxyPort=8080 @@ -177,213 +61,465 @@ - no-debug.with-proxy - - true - - - - ${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.tractrac} ${parameters.mongodb} - - - - - no-debug.without-proxy - - - ${parameters.common} ${parameters.vm-settings} ${parameters.mongodb} - - - - - debug.with-proxy - - - ${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.debug} ${parameters.mongodb} - - - - - debug.without-proxy - - - ${parameters.common} ${parameters.vm-settings} ${parameters.debug} ${parameters.mongodb} - - - - - p2-target.local - - - race-analysis-p2-local - - + + with-not-android-relevant - p2-local + !ldi.releaseBuild - - - - - bin - bin - bin - - + + com.sap.sse + com.sap.sse.mail + com.sap.sse.mail.replication.test + com.sap.sse.mail.replication.testsupport + com.sap.sse.mongodb + com.sap.sse.gwt + com.sap.sse.gwt.adminconsole + com.sap.sse.datamining + com.sap.sse.datamining.shared + com.sap.sse.security + com.sap.sse.security.ui + com.sap.sse.security.userstore.mongodb + com.sap.sse.operationaltransformation + com.sap.sse.replication + com.sap.sse.threadmanager + com.sap.sse.filestorage + com.sap.sse.gwt.theme + com.sap.sailing.domain + com.sap.sailing.geocoding + com.sap.sailing.datamining + com.sap.sailing.datamining.shared + com.sap.sailing.domain.persistence + com.sap.sailing.domain.deckmanadapter + com.sap.sailing.domain.tractracadapter + com.sap.sailing.domain.tractracadapter.persistence + com.sap.sailing.domain.igtimiadapter + com.sap.sailing.domain.igtimiadapter.persistence + com.sap.sailing.domain.racelogtrackingadapter + com.sap.sailing.domain.racelogtrackingadapter.testsupport + com.sap.sailing.domain.swisstimingadapter + com.sap.sailing.domain.swisstimingadapter.persistence + com.sap.sailing.domain.swisstimingreplayadapter + com.sap.sailing.news + com.sap.sailing.declination + com.sap.sailing.udpconnector + com.sap.sailing.expeditionconnector + com.sap.sailing.server + com.sap.sailing.server.gateway + com.sap.sailing.server.gateway.serialization + com.sap.sailing.www + com.sap.sailing.www.events + com.sap.sailing.xmlexport + com.google.gwt.dev + com.google.gwt.osgi + com.tractrac.clientmodule + com.googlecode.java-diff-utils + com.googlecode.mgwt + com.sap.sailing.dashboards.gwt + com.sap.sailing.feature + org.moxieapps.gwt.highcharts + com.sap.sailing.resultimport + com.sap.sailing.kiworesultimport + com.sap.sailing.ess40.resultimport + com.sap.sailing.xrr.schema + com.sap.sailing.xrr.resultimport + com.sap.sailing.xrr.structureimport + com.sap.sailing.freg.resultimport + org.openqa.selenium.osgi + com.sap.sailing.monitoring + com.sap.sailing.simulator + com.sap.sailing.server.trackfiles + com.sap.sailing.feature.runtime + com.sap.sailing.gwt.ui + com.sap.sailing.domain.test + com.sap.sse.replication.testsupport + + com.sap.sse.gwt.test + + com.sap.sse.datamining.test + com.sap.sse.security.replication.test + com.sap.sse.security.test + com.sap.sse.operationaltransformation.test + com.sap.sse.common.test + com.sap.sse.filestorage.test + com.sap.sailing.datamining.test + com.sap.sailing.domain.deckmanadapter.test + com.sap.sailing.domain.igtimiadapter.test + com.sap.sailing.domain.racelogtrackingadapter.test + com.sap.sailing.xmlexport.test + com.sap.sailing.xrr.resultimport.test + com.sap.sailing.domain.shared.android.test + com.sap.sailing.geocoding.test + com.sap.sailing.domain.swisstimingadapter.test + com.sap.sailing.domain.swisstimingreplayadapter.test + com.sap.sailing.declination.test + com.sap.sailing.expeditionconnector.test + com.sap.sailing.server.test + com.sap.sailing.server.gateway.test + com.sap.sailing.server.gateway.test.support + com.sap.sailing.server.gateway.serialization.test + com.sap.sailing.server.replication.test + com.sap.sailing.gwt.ui.test + com.sap.sailing.mongodb.test + com.googlecode.java-diff-utils.test + com.sap.sailing.kiworesultimport.test + com.sap.sailing.ess40.resultimport.test + com.sap.sailing.freg.resultimport.test + com.sap.sailing.barbados.resultimport + com.sap.sailing.barbados.resultimport.test + com.sap.sailing.velum.resultimport + com.sap.sailing.velum.resultimport.test + com.sap.sailing.sailwave.resultimport + com.sap.sailing.sailwave.resultimport.test + com.sap.sailing.manage2sail + com.sap.sailing.manage2sail.resultimport + com.sap.sailing.manage2sail.resultimport.test + com.sap.sailing.simulator.test + com.sap.sailing.server.trackfiles.test + com.sap.sailing.selenium.test + com.sap.sailing.autoload + com.sap.sailing.feature.p2build + com.sap.sailing.polars + com.sap.sailing.polars.datamining + com.sap.sailing.polars.datamining.shared + com.sap.sailing.polars.test + + + - true org.eclipse.tycho - eclipse-test-plugin - ${tycho-version} - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 + target-platform-configuration - ${reportsdirectory} + + + + eclipse-plugin + com.google.gwt.dev + 0.0.0 + + + - + + + + no-debug.with-proxy + + true + + + + ${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.tractrac} ${parameters.mongodb} + + + + + no-debug.without-proxy + + + ${parameters.common} ${parameters.vm-settings} ${parameters.mongodb} + + + + + debug.with-proxy + + + ${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.debug} ${parameters.mongodb} + + + + + debug.without-proxy + + + ${parameters.common} ${parameters.vm-settings} ${parameters.debug} ${parameters.mongodb} + + + + + p2-target.local + + + race-analysis-p2-local + + + + + p2-local + + + + + + leandi + + + + ldi.releaseBuild + + + + + race-analysis-p2-empty + + + + + com.sap.sailing + install-android-sdk + ${project.version} + provided + pom + + + + + + org.eclipse.tycho + tycho-compiler-plugin + + + 1.7 + 1.7 + + + + + + + + non-leandi + + + + !ldi.releaseBuild + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + + BREE + + + + + + + + bin + bin + bin + + + true org.eclipse.tycho - tycho-maven-plugin + eclipse-test-plugin ${tycho-version} - true - org.eclipse.tycho - target-platform-configuration - ${tycho-version} + org.apache.maven.plugins + maven-surefire-plugin + 2.16 - p2 - - - - eclipse-plugin - com.google.gwt.dev - 0.0.0 - - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ../com.sap.sailing.targetplatform/definitions/${p2-target} - - - - - linux - gtk - x86 - - - linux - gtk - x86_64 - - - win32 - win32 - x86 - - - win32 - win32 - x86_64 - - - macosx - cocoa - x86_64 - - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - ${tycho.build.argLine} - - - **/*$* - ${reportsdirectory} - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - BREE - - - - - - org.codehaus.mojo - gwt-maven-plugin - ${gwt.version} - - - - - -Dgwt.persistentunitcache=false -Xmx2048m - - - ${gwt.workers} - - - - - - + com.simpligility.maven.plugins + android-maven-plugin + + src + AndroidManifest.xml + + *.jar + generated-sources/** + maven-archiver/** + sourcebundle-l10n-gen/** + p2* + MANIFEST.MF + *.ap_ + local-artifacts.properties + **/*.gwt.xml + + + + + aar + + aar + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + package + + attach-artifact + + + + + aar + ${project.build.directory}/${project.build.finalName}.aar + + + + + + + - - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-beta-6 - - + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + p2 + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ../com.sap.sailing.targetplatform/definitions/${p2-target} + + + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + ${tycho.build.argLine} + + + **/*$* + + ${reportsdirectory} + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - + + org.codehaus.mojo + gwt-maven-plugin + ${gwt.version} + + + + + -Dgwt.persistentunitcache=false -Xmx2048m + + + ${gwt.workers} + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-beta-6 + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + true + + ${reportsdirectory} true - - ${reportsdirectory} - true - - - - - + + + + + diff --git a/mobile/com.sap.sailing.android.shared/AndroidManifest.xml b/mobile/com.sap.sailing.android.shared/AndroidManifest.xml index 8f7008af9ff..241f97290e1 100644 --- a/mobile/com.sap.sailing.android.shared/AndroidManifest.xml +++ b/mobile/com.sap.sailing.android.shared/AndroidManifest.xml @@ -3,6 +3,6 @@ android:versionCode="1" android:versionName="1.0"> - + diff --git a/mobile/com.sap.sailing.android.shared/pom.xml b/mobile/com.sap.sailing.android.shared/pom.xml index 097822c2adb..64c5814649a 100644 --- a/mobile/com.sap.sailing.android.shared/pom.xml +++ b/mobile/com.sap.sailing.android.shared/pom.xml @@ -9,81 +9,87 @@ 1.0.0-SNAPSHOT com.sap.sailing.android.shared - apklib + aar - com.sap.sailing - org.json.simple - 1.1.0-SNAPSHOT - compile + com.android.support + appcompat-v7 + aar - + com.sap.sailing - com.sap.sailing.domain.shared.android - 1.0.0-SNAPSHOT + com.sap.sse.security.common + ${project.version} + aar compile - + com.sap.sailing com.sap.sse.shared.android - 1.0.0-SNAPSHOT + ${project.version} + aar compile - + + + com.sap.sailing + com.sap.sse.datamining.annotations + ${project.version} + aar + compile + + + + com.sap.sailing + com.sap.sailing.domain.common + ${project.version} + aar + compile + + + + com.sap.sailing + com.sap.sailing.domain.shared.android + ${project.version} + aar + compile + + com.sap.sailing com.sap.sailing.server.gateway.serialization.shared.android - 1.0.0-SNAPSHOT + ${project.version} + aar compile com.sap.sailing com.sap.sse.common - 1.0.0-SNAPSHOT + ${project.version} + aar compile - - - com.sap.sailing - com.sap.sailing.domain.common - 1.0.0-SNAPSHOT - compile - - + com.sap.sailing org.json.simple 1.1.0-SNAPSHOT + aar compile - - com.android.support - support-v4 - 21.0.3 - aar - - - - com.android.support - appcompat-v7 - 21.0.3 - aar - - com.google.android.gms - play-services - 6.5.87 + play-services-location aar - + - android + ${android.api.groupId} android @@ -93,13 +99,8 @@ ${project.artifactId} - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - - - 21 - - diff --git a/mobile/com.sap.sailing.android.tracking.app/.classpath b/mobile/com.sap.sailing.android.tracking.app/.classpath index 6268b94df9c..e6e526abe03 100644 --- a/mobile/com.sap.sailing.android.tracking.app/.classpath +++ b/mobile/com.sap.sailing.android.tracking.app/.classpath @@ -1,10 +1,12 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/mobile/com.sap.sailing.android.tracking.app/.gitignore b/mobile/com.sap.sailing.android.tracking.app/.gitignore index ff94b24a6bd..0c7236cd777 100644 --- a/mobile/com.sap.sailing.android.tracking.app/.gitignore +++ b/mobile/com.sap.sailing.android.tracking.app/.gitignore @@ -1,3 +1,3 @@ -/gen -/bin -/target +bin/ +target/ +gen/ diff --git a/mobile/com.sap.sailing.android.tracking.app/assets/build.info b/mobile/com.sap.sailing.android.tracking.app/assets/build.info new file mode 100644 index 00000000000..13f81c9bd79 --- /dev/null +++ b/mobile/com.sap.sailing.android.tracking.app/assets/build.info @@ -0,0 +1 @@ +${git.branch}-${git.commit.id.abbrev} (${git.commit.time}) diff --git a/mobile/com.sap.sailing.android.tracking.app/assets/empty b/mobile/com.sap.sailing.android.tracking.app/assets/empty deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mobile/com.sap.sailing.android.tracking.app/pom.xml b/mobile/com.sap.sailing.android.tracking.app/pom.xml index 649d48dbaa1..83e4b7e5b57 100644 --- a/mobile/com.sap.sailing.android.tracking.app/pom.xml +++ b/mobile/com.sap.sailing.android.tracking.app/pom.xml @@ -1,123 +1,174 @@ - 4.0.0 - - - com.sap.sailing - mobile - 1.0.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - com.sap.sailing - com.sap.sailing.android.tracking.app - apk + + com.sap.sailing + mobile + 1.0.0-SNAPSHOT + - - - com.sap.sailing.android.tracking.app.version - - ${tracking-app-version} - + com.sap.sailing + com.sap.sailing.android.tracking.app + apk - - - android - android - + + + com.sap.sailing.android.tracking.app.version + + ${tracking-app-version} + - + + + ${android.api.groupId} + android + - - com.android.support - support-v4 - 21.0.3 - aar - + + com.google.android.gms + play-services-gcm + aar + - - com.android.support - appcompat-v7 - 21.0.3 - aar - + + ${project.groupId} + com.sap.sailing.android.shared + ${project.version} + aar + - - com.google.android.gms - play-services - 6.5.87 - aar - + + junit + junit + 4.8.2 + test + + + org.mockito + mockito-core + 1.10.16 + test + - - com.sap.sailing - com.sap.sailing.android.shared - 1.0.0-SNAPSHOT - apklib - - + - - ${project.artifactId} - src - + + ${project.artifactId} + src + + + com.simpligility.maven.plugins + android-maven-plugin + + + alignApk + install + + zipalign + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + generate-test-sources + + add-test-source + + + + ${project.basedir}/tests-jvm/src + + + + + + + + + + + non-leandi + + + !ldi.releaseBuild + + + + - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - - true - true - - 21 - - true - - - true - proguard-project.txt - - ${env.ANDROID_HOME}/tools/proguard/proguard-android.txt - - - - false - - - - - - apk - - - - - ^com\.sap\..*.jar$ - - - - + + org.apache.maven.plugins + maven-jarsigner-plugin - - + org.apache.maven.plugins maven-dependency-plugin + org.apache.maven.plugins maven-antrun-plugin + maven-clean-plugin - - - + + + + + + leandi-no-realsign + + + + ldi.releaseType + milestone + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + + + + + leandi-realsign + + + + ldi.releaseType + customer + + + + + + com.sap.prd.codesign + com.sap.prd.codesign.maven-jarsigner-plugin + + + + + + diff --git a/mobile/com.sap.sailing.buoy.positioning/.classpath b/mobile/com.sap.sailing.buoy.positioning/.classpath index 7bc01d9a9c6..188aa5ca4e3 100644 --- a/mobile/com.sap.sailing.buoy.positioning/.classpath +++ b/mobile/com.sap.sailing.buoy.positioning/.classpath @@ -2,8 +2,10 @@ + + diff --git a/mobile/com.sap.sailing.buoy.positioning/assets/build.info b/mobile/com.sap.sailing.buoy.positioning/assets/build.info new file mode 100644 index 00000000000..13f81c9bd79 --- /dev/null +++ b/mobile/com.sap.sailing.buoy.positioning/assets/build.info @@ -0,0 +1 @@ +${git.branch}-${git.commit.id.abbrev} (${git.commit.time}) diff --git a/mobile/com.sap.sailing.buoy.positioning/assets/empty b/mobile/com.sap.sailing.buoy.positioning/assets/empty deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mobile/com.sap.sailing.buoy.positioning/pom.xml b/mobile/com.sap.sailing.buoy.positioning/pom.xml index 4c53262cc4c..8d391a7a12c 100644 --- a/mobile/com.sap.sailing.buoy.positioning/pom.xml +++ b/mobile/com.sap.sailing.buoy.positioning/pom.xml @@ -1,124 +1,167 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - com.sap.sailing - mobile - 1.0.0-SNAPSHOT - + + com.sap.sailing + mobile + 1.0.0-SNAPSHOT + - com.sap.sailing - com.sap.sailing.android.buoy.positioning.app - apk + com.sap.sailing + com.sap.sailing.android.buoy.positioning.app + apk - - - com.sap.sailing.android.buoy.positioning.app.version - - - ${buoy.positioning-app-version} - + + + com.sap.sailing.android.buoy.positioning.app.version + + + ${buoy.positioning-app-version} + - - - android - android - + + + ${android.api.groupId} + android + - + + ${project.groupId} + com.sap.sailing.android.shared + ${project.version} + aar + + + junit + junit + 4.8.2 + test + + + org.mockito + mockito-core + 1.10.16 + test + - - com.android.support - support-v4 - 21.0.3 - aar - + + + ${project.artifactId} + src + + + com.simpligility.maven.plugins + android-maven-plugin + + + alignApk + install + + zipalign + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + generate-test-sources + + add-test-source + + + + ${project.basedir}/tests-jvm/src + + + + + + + - - com.android.support - appcompat-v7 - 22.2.0 - aar - - - - com.google.android.gms - play-services - 7.5.0 - aar - - - - com.sap.sailing - com.sap.sailing.android.shared - 1.0.0-SNAPSHOT - apklib - - - - - ${project.artifactId} - src - + + + non-leandi + + + !ldi.releaseBuild + + + + - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - - true - true - - 21 - - true - - - true - proguard-project.txt - - ${env.ANDROID_HOME}/tools/proguard/proguard-android.txt - - - - false - - - - - - apk - - - - - ^com\.sap\..*.jar$ - - - - + + org.apache.maven.plugins + maven-jarsigner-plugin - - + org.apache.maven.plugins maven-dependency-plugin + org.apache.maven.plugins maven-antrun-plugin + maven-clean-plugin - - - + + + + + + leandi-no-realsign + + + + ldi.releaseType + milestone + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + + + + + leandi-realsign + + + + ldi.releaseType + customer + + + + + + com.sap.prd.codesign + com.sap.prd.codesign.maven-jarsigner-plugin + + + + + + diff --git a/mobile/com.sap.sailing.buoy.positioning/project.properties b/mobile/com.sap.sailing.buoy.positioning/project.properties index c3b9d191368..6e9dea4c88d 100644 --- a/mobile/com.sap.sailing.buoy.positioning/project.properties +++ b/mobile/com.sap.sailing.buoy.positioning/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 android.library.reference.1=../google-play-services_lib android.library.reference.2=../com.sap.sailing.android.shared diff --git a/mobile/com.sap.sailing.racecommittee.app/.gitignore b/mobile/com.sap.sailing.racecommittee.app/.gitignore index ff94b24a6bd..0c7236cd777 100755 --- a/mobile/com.sap.sailing.racecommittee.app/.gitignore +++ b/mobile/com.sap.sailing.racecommittee.app/.gitignore @@ -1,3 +1,3 @@ -/gen -/bin -/target +bin/ +target/ +gen/ diff --git a/mobile/com.sap.sailing.racecommittee.app/assets/build.info b/mobile/com.sap.sailing.racecommittee.app/assets/build.info new file mode 100644 index 00000000000..13f81c9bd79 --- /dev/null +++ b/mobile/com.sap.sailing.racecommittee.app/assets/build.info @@ -0,0 +1 @@ +${git.branch}-${git.commit.id.abbrev} (${git.commit.time}) diff --git a/mobile/com.sap.sailing.racecommittee.app/assets/empty b/mobile/com.sap.sailing.racecommittee.app/assets/empty deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mobile/com.sap.sailing.racecommittee.app/pom.xml b/mobile/com.sap.sailing.racecommittee.app/pom.xml index 7acfbcad920..5d5738fa2b8 100644 --- a/mobile/com.sap.sailing.racecommittee.app/pom.xml +++ b/mobile/com.sap.sailing.racecommittee.app/pom.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - + com.sap.sailing mobile @@ -21,61 +21,52 @@ - - android + ${android.api.groupId} android - - - - com.android.support - support-v4 - 21.0.3 - aar - - - - com.android.support - appcompat-v7 - 21.0.3 - aar - - - - com.google.android.gms - play-services - 6.5.87 - aar - - - - - com.mobeta.android.dslv - drag-sort-listview - 0.6.1-SNAPSHOT - apklib - - com.google.android - support-v4 + + com.android.support + recyclerview-v7 + + + com.android.support + appcompat-v7 - com.sap.sailing - com.sap.sailing.android.shared - 1.0.0-SNAPSHOT - apklib + com.android.support + recyclerview-v7 + aar + + + + ${project.groupId} + com.sap.sailing.android.shared + ${project.version} + aar + + + + junit + junit + 4.8.2 + test + + + org.mockito + mockito-core + 1.10.16 + test @@ -84,54 +75,116 @@ src - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - - true - true - - 21 - - true - - - true - proguard-project.txt - - ${env.ANDROID_HOME}/tools/proguard/proguard-android.txt - - - - false - - + alignApk + install - apk + zipalign + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + generate-test-sources + + add-test-source - - - ^com\.sap\..*.jar$ - + + ${project.basedir}/tests-jvm/src + - - + + + + + + non-leandi + + + !ldi.releaseBuild + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + org.apache.maven.plugins maven-dependency-plugin + org.apache.maven.plugins maven-antrun-plugin + maven-clean-plugin - - + + + + + + leandi-no-realsign + + + + ldi.releaseType + milestone + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + + + + + leandi-realsign + + + + ldi.releaseType + customer + + + + + + com.sap.prd.codesign + com.sap.prd.codesign.maven-jarsigner-plugin + + + + + + diff --git a/mobile/pom.xml b/mobile/pom.xml index e3fc75b072d..b69d42e75ca 100644 --- a/mobile/pom.xml +++ b/mobile/pom.xml @@ -1,145 +1,528 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - workspace - com.sap.sailing - 1.0.0-SNAPSHOT - + + workspace + com.sap.sailing + 1.0.0-SNAPSHOT + - mobile - pom + mobile + pom - - - + + com.sap.sailing.android.shared + com.sap.sailing.racecommittee.app + com.sap.sailing.android.tracking.app + com.sap.sailing.buoy.positioning + - + - - ../../java/com.sap.sailing.www/apps - - - - - - - - - - android - android - 4.4.2_r4 - provided - + + ../../java/com.sap.sailing.www/apps + + + + 22.1.1 + 7.5.0 - - - android.support - compatibility-v4 - 19 - - - + ../android-keystore/STG-debug.jks + stg_debug + stg_debug + stg_debug + - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.9.0-rc.1 - + + + + ${android.api.groupId} + android + ${android.api.version} + provided + + + com.android.support + appcompat-v7 + ${android.support.version} + aar + + + com.android.support + support-v4 + ${android.support.version} + aar + + + com.android.support + recyclerview-v7 + ${android.support.version} + aar + + + com.google.android.gms + play-services-location + ${play.services.version} + aar + + + com.google.android.gms + play-services-gcm + ${play.services.version} + aar + + + + + + + + ${project.basedir}/assets + true + ${project.build.directory}/filteredassets + + build.info + + + + ${project.basedir}/assets + false + ${project.build.directory}/filteredassets + + build.info + + + + + + pl.project13.maven + git-commit-id-plugin + 2.2.0 + + true + + + + + revision + + + + + + maven-resources-plugin + + + initialize + + resources + + + + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + res + ${project.build.directory}/filteredassets + + ${project.basedir}/src + + false + false + false + false + true + true + false + ${project.build.directory}/${project.build.finalName}-unaligned.apk + + + true + + ${env.ANDROID_HOME}/tools/proguard/proguard-android.txt + ${project.basedir}/proguard-project.txt + ${project.basedir}/../proguard-mobile.txt + + + + false + ${project.build.directory}/${project.build.finalName}-unaligned.apk + ${project.build.directory}/${project.build.finalName}.apk + + + + ^.*-sources.jar$ + ^android.*.jar$ + + + + -Xms1024m + -Xmx2048m + + + + *.jar + generated-sources/** + maven-archiver/** + sourcebundle-l10n-gen/** + p2* + MANIFEST.MF + *.ap_ + local-artifacts.properties + android/** + com/google/** + **/R.class + **/R$*.class + - 19 + 22 - - true - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-installed - install - - copy - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - - - ${additional-deployment-dir} - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - generate-version - install - - run - - - - - + + false + + + + + alignApk + pre-integration-test + + zipalign + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + 1.4 + + + signing + + sign + verify + + package + true + + true + ${project.build.directory}/${project.build.finalName}-unaligned.apk + ${sign.keystore} + ${sign.alias} + ${sign.storepass} + ${sign.keypass} + true + + -sigalgMD5withRSA + -digestalgSHA1 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + + ttf + pdf + + + - - - - - - - - - maven-clean-plugin - 2.5 - - - - ${additional-deployment-dir} - - ${project.build.finalName}.apk - ${additional-deployment-version-file} - - - *.gitignore - - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - - - + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + - + + + + + non-leandi-release + + false + + + ../android-keystore/STG.jks + + + + + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + true + + + + + + + + + leandi-release + + + ldi.releaseBuild + true + + + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + true + + + + + + + + + leandi + + + ldi.releaseBuild + + + + + + com.sap.sailing + install-android-sdk + ${project.version} + provided + pom + + + + + + non-leandi + + + !ldi.releaseBuild + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-installed + install + + copy + + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ${project.packaging} + + + ${additional-deployment-dir} + true + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-version + install + + run + + + + + + + + + + + + + + + maven-clean-plugin + 2.5 + + + + ${additional-deployment-dir} + + ${project.build.finalName}.apk + ${additional-deployment-version-file} + + + *.gitignore + + false + + + + + + + + + + + + leandi-realsign + + + ldi.releaseType + customer + + + + + + + + com.sap.prd.codesign + com.sap.prd.codesign.maven-jarsigner-plugin + + + ANDROID + ${project.build.directory} + false + false + true + + ${project.build.finalName}-unaligned.apk + + + + + + + sign + package + + sign + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 77c807e02f7..256a901df9c --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,14 @@ - with-mobile - true + + + ldi.releaseBuild + mobile @@ -31,38 +35,144 @@ ios + + + leandi + + + + ldi.releaseBuild + + + + + install-android-sdk + + + + com.google.download.android + + 5.1.1 + + + + + + com.simpligility.maven.plugins + android-maven-plugin + + + + ${ldi.android.sdk.location} + + + + + + + + + non-leandi + + + !ldi.releaseBuild + + + + + + equinox-sdk-3.9 + p2 + http://download.eclipse.org/releases/luna/ + + + + sailing-server-maven + http://maven.sapsailing.com/maven + + + + central + http://repo1.maven.org/maven2 + + + + uni-luebeck + http://www.itm.uni-luebeck.de/projects/maven/releases + + + UTF-8 UTF-8 + + + 24.4 + 21.1 + 23.0.1 + 22.0.1 + 5.1 + 22_r02 + + + ${env.WORKSPACE} + ${ldi.android.sdk.parent.location}/android-sdk-windows + + 22 + android + 5.1.1_r2 - - - equinox-sdk-3.9 - p2 - http://download.eclipse.org/releases/luna/ - - - - sailing-server-maven - http://maven.sapsailing.com/maven - - - - central - http://repo1.maven.org/maven2 - - - - uni-luebeck - http://www.itm.uni-luebeck.de/projects/maven/releases - - + + + + org.apache.maven.plugins + maven-help-plugin + 2.2 + + + activeProfiles + initialize + + active-profiles + + + + + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.3.0 + true + + AndroidManifest.xml + ${project.build.directory}/AndroidManifest.xml + + ${android.platform} + + + + + + + diff --git a/wiki/android-and-release-build.md b/wiki/android-and-release-build.md new file mode 100644 index 00000000000..6a300d542ea --- /dev/null +++ b/wiki/android-and-release-build.md @@ -0,0 +1,25 @@ +# Android and release build + +[[_TOC_]] + +## Basic setup of the Android apps build + +The Android Build is based on Maven and is part of the overall multi-module-build. The Android specific projects are hosted in /mobile. The build of the app projects is completely separated from Tycho/p2. + +## Backend Build vs Android Build + +Due to some incompatibilities of the Android Build with specifics of the Tycho Build, it's not possible to build the backend and Android apps in one execution. That's why there are several profiles that control, what is part of the specific build. + +The default activation of the profiles causes the backend build to run. The relevant profiles to switch between backend and Adnroid build are: +* with-mobile (defauts to off) +* with-not-android-relevant (defauts to on) + +So to run the Android apps build you have to add "-P -with-not-android-relevant -P with-mobile" to the Maven command line. + +## Release build overview + +There are several differences when running the build on Lean DI. Due to this, it's necessary to implement some changes in the build. To realize the build for Lean DI there is a specific branch "android-maven-build-bug3190-release". It is intended that most of the Lean DI specific logic is implemented on "master" in specific Maven profiles. This causes the release branch to only have few differences compared to "master". The most notable differences are: + +* Configuration of parent POM "com.sap.ldi:ldi-parent" in workspace POM +* Versions are set to not be *-SNAPSHOT but release versions +* Some profile activation conditions are changed