mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-20 19:20:04 +00:00
Merge branch 'master' into bug2851
This commit is contained in:
commit
7216a8cee5
45 files changed
+2367
-1221
No files matched your search
@@ -32,5 +32,4 @@ out/
|
|||||||
.gradle
|
.gradle
|
||||||
local.properties
|
local.properties
|
||||||
git.xml
|
git.xml
|
||||||
build.info
|
|
||||||
mobile/github-advrecyclerview_lib/bin
|
mobile/github-advrecyclerview_lib/bin
|
||||||
@@ -5,7 +5,7 @@ set -o functrace
|
|||||||
# and is used to correctly resolve bundle names
|
# and is used to correctly resolve bundle names
|
||||||
PROJECT_TYPE="sailing"
|
PROJECT_TYPE="sailing"
|
||||||
|
|
||||||
find_project_home ()
|
find_project_home ()
|
||||||
{
|
{
|
||||||
if [[ "$1" == '/' ]] || [[ "$1" == "" ]]; then
|
if [[ "$1" == '/' ]] || [[ "$1" == "" ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
@@ -173,7 +173,7 @@ do
|
|||||||
u) suppress_confirmation=1;;
|
u) suppress_confirmation=1;;
|
||||||
v) p2local=1;;
|
v) p2local=1;;
|
||||||
x) GWT_WORKERS=$OPTARG;;
|
x) GWT_WORKERS=$OPTARG;;
|
||||||
j) TESTCASE_TO_EXECUTE=$OPTARG;;
|
j) TESTCASE_TO_EXECUTE=$OPTARG;;
|
||||||
\?) echo "Invalid option"
|
\?) echo "Invalid option"
|
||||||
exit 4;;
|
exit 4;;
|
||||||
esac
|
esac
|
||||||
@@ -306,11 +306,11 @@ MEMORY=4096m
|
|||||||
REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl
|
REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl
|
||||||
INSTALL_FROM_RELEASE=$SIMPLE_VERSION_INFO
|
INSTALL_FROM_RELEASE=$SIMPLE_VERSION_INFO
|
||||||
" >> $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO/amazon-launch-config_replica.txt
|
" >> $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 *
|
`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 $ACDIR/env.sh $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO
|
||||||
cp $PROJECT_HOME/build/release-notes.txt $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO
|
cp $PROJECT_HOME/build/release-notes.txt $PROJECT_HOME/dist/$SIMPLE_VERSION_INFO
|
||||||
|
|
||||||
cd $PROJECT_HOME
|
cd $PROJECT_HOME
|
||||||
rm -rf build/*
|
rm -rf build/*
|
||||||
|
|
||||||
@@ -322,7 +322,7 @@ INSTALL_FROM_RELEASE=$SIMPLE_VERSION_INFO
|
|||||||
echo "Checking the remote connection..."
|
echo "Checking the remote connection..."
|
||||||
REMOTE_HOME=`ssh $REMOTE_SERVER_LOGIN 'echo $HOME/releases'`
|
REMOTE_HOME=`ssh $REMOTE_SERVER_LOGIN 'echo $HOME/releases'`
|
||||||
echo "Now uploading release to $REMOTE_SERVER_LOGIN:$REMOTE_HOME. Can take quite a while!"
|
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/
|
`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)"
|
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
|
fi
|
||||||
@@ -607,7 +607,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
|||||||
if [ $android -eq 0 ] && [ $gwtcompile -eq 0 ] && [ $testing -eq 0 ]; then
|
if [ $android -eq 0 ] && [ $gwtcompile -eq 0 ] && [ $testing -eq 0 ]; then
|
||||||
parallelexecution=1
|
parallelexecution=1
|
||||||
echo "INFO: Running build in parallel with 2.5*CPU threads"
|
echo "INFO: Running build in parallel with 2.5*CPU threads"
|
||||||
extra="$extra -T 2.5C"
|
extra="$extra -T 2.5C"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $android -eq 1 ]; then
|
if [ $android -eq 1 ]; then
|
||||||
@@ -620,22 +620,32 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
|||||||
PATH=$PATH:$ANDROID_HOME/tools
|
PATH=$PATH:$ANDROID_HOME/tools
|
||||||
PATH=$PATH:$ANDROID_HOME/platform-tools
|
PATH=$PATH:$ANDROID_HOME/platform-tools
|
||||||
ANDROID="$ANDROID_HOME/tools/android"
|
ANDROID="$ANDROID_HOME/tools/android"
|
||||||
if [ \! -x "$ANDROID" ]; then
|
if [ \! -x "$ANDROID" ]; then
|
||||||
ANDROID="$ANDROID_HOME/tools/android.bat"
|
ANDROID="$ANDROID_HOME/tools/android.bat"
|
||||||
fi
|
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"
|
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"
|
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"
|
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")
|
NOW=$(date +"%s")
|
||||||
BUILD_TOOLS=22.0.1
|
BUILD_TOOLS=22.0.1
|
||||||
TARGET_API=22
|
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 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 "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
|
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
|
if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||||
exit 100
|
exit 100
|
||||||
fi
|
fi
|
||||||
if [ $testing -eq 1 ]; then
|
if [ $testing -eq 1 ]; then
|
||||||
echo "Starting JUnit tests..."
|
echo "Starting JUnit tests..."
|
||||||
./gradlew test | tee -a $START_DIR/build.log
|
# ./gradlew test | tee -a $START_DIR/build.log
|
||||||
if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
# if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||||
exit 103
|
# exit 103
|
||||||
fi
|
# fi
|
||||||
# TODO find a way that the emulator test is stable in hudson
|
# TODO find a way that the emulator test is stable in hudson
|
||||||
# adb emu kill
|
# adb emu kill
|
||||||
# echo "Downloading image (sys-img-${ANDROID_ABI}-android-${TEST_API})..." | tee -a $START_DIR/build.log
|
# 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
|
# adb emu kill
|
||||||
# "$ANDROID" delete avd --name ${AVD_NAME}
|
# "$ANDROID" delete avd --name ${AVD_NAME}
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo "INFO: Deactivating mobile modules"
|
|
||||||
extra="$extra -P !with-mobile"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $reporting -eq 1 ]; then
|
if [ $reporting -eq 1 ]; then
|
||||||
@@ -704,6 +714,8 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
|||||||
# needed to make sure that tests use the right servers
|
# 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"
|
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 "Using following command: mvn $extra -DargLine=\"$APP_PARAMETERS\" -fae -s $MAVEN_SETTINGS $clean install"
|
||||||
echo "Maven version used: `mvn --version`"
|
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
|
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/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/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/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/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/start $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
|
||||||
$SCP_CMD $PROJECT_HOME/java/target/stop $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/status $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
|
||||||
$SCP_CMD $PROJECT_HOME/java/target/udpmirror $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/http2udpmirror $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
|
||||||
$SCP_CMD $PROJECT_HOME/java/target/configuration/logging.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/
|
$SCP_CMD $PROJECT_HOME/java/target/configuration/logging.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<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/maven-v4_0_0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<artifactId>workspace</artifactId>
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>install-android-sdk</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<!-- The submodule "install-android-sdk" is only added to the build on Lean DI.
|
||||||
|
The modules only purpose is to assemble the Android SDK if it doesn't already exist in the build Job. -->
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>install-android-sdk-windows</id>
|
||||||
|
<activation>
|
||||||
|
<file>
|
||||||
|
<missing>${ldi.android.sdk.location}/platform-tools/adb.exe</missing>
|
||||||
|
</file>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>install-android-sdk</id>
|
||||||
|
<phase>initialize</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>unpack</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifactItems>
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>com.google.download.android</groupId>
|
||||||
|
<artifactId>android-sdk-windows</artifactId>
|
||||||
|
<version>${ldi.download.android.sdk.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>false</overWrite>
|
||||||
|
<outputDirectory>${ldi.android.sdk.parent.location}</outputDirectory>
|
||||||
|
<includes>**/*</includes>
|
||||||
|
</artifactItem>
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>com.google.download.android</groupId>
|
||||||
|
<artifactId>platform-tools-windows</artifactId>
|
||||||
|
<version>${ldi.download.android.platform-tools.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>false</overWrite>
|
||||||
|
<outputDirectory>${ldi.android.sdk.location}</outputDirectory>
|
||||||
|
<includes>**/*</includes>
|
||||||
|
</artifactItem>
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>com.google.download.android</groupId>
|
||||||
|
<artifactId>build-tools-windows</artifactId>
|
||||||
|
<version>${ldi.download.android.build-tools.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>false</overWrite>
|
||||||
|
<outputDirectory>${ldi.android.sdk.location}/build-tools</outputDirectory>
|
||||||
|
<includes>**/*</includes>
|
||||||
|
</artifactItem>
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>com.google.download.android</groupId>
|
||||||
|
<artifactId>android</artifactId>
|
||||||
|
<version>${ldi.download.android.platform.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>false</overWrite>
|
||||||
|
<outputDirectory>${ldi.android.sdk.location}/platforms</outputDirectory>
|
||||||
|
<includes>**/*</includes>
|
||||||
|
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
</artifactItems>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>move_platform_dir</id>
|
||||||
|
<phase>initialize</phase>
|
||||||
|
|
||||||
|
<configuration>
|
||||||
|
<tasks>
|
||||||
|
<move file="${ldi.android.sdk.location}/platforms/android-${android.api.version}"
|
||||||
|
tofile="${ldi.android.sdk.location}/platforms/android-${android.platform.version}"/>
|
||||||
|
<move file="${ldi.android.sdk.location}/build-tools/android-${ldi.android.build-tools.version}"
|
||||||
|
tofile="${ldi.android.sdk.location}/build-tools/${ldi.download.android.build-tools.version}"/>
|
||||||
|
</tasks>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -52,37 +52,37 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.domain.common</artifactId>
|
<artifactId>com.sap.sailing.domain.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt</artifactId>
|
<artifactId>com.sap.sse.gwt</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt.adminconsole</artifactId>
|
<artifactId>com.sap.sse.gwt.adminconsole</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.datamining.shared</artifactId>
|
<artifactId>com.sap.sailing.datamining.shared</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.datamining.shared</artifactId>
|
<artifactId>com.sap.sse.datamining.shared</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.json.simple"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -1,40 +1,62 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project 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"
|
<project
|
||||||
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"
|
||||||
<modelVersion>4.0.0</modelVersion>
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<parent>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>root</artifactId>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<artifactId>root</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<groupId>com.sap.sailing</groupId>
|
||||||
</parent>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<artifactId>com.sap.sailing.domain.common</artifactId>
|
</parent>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<artifactId>com.sap.sailing.domain.common</artifactId>
|
||||||
|
<packaging>eclipse-plugin</packaging>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.7</source>
|
||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-source-plugin</artifactId>
|
<artifactId>tycho-source-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>plugin-source</id>
|
<id>plugin-source</id>
|
||||||
<phase>generate-sources</phase>
|
<phase>generate-sources</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>plugin-source</goal>
|
<goal>plugin-source</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.json.simple"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -1,39 +1,63 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project 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"
|
<project
|
||||||
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"
|
||||||
<modelVersion>4.0.0</modelVersion>
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<parent>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>root</artifactId>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<artifactId>root</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<groupId>com.sap.sailing</groupId>
|
||||||
</parent>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<artifactId>com.sap.sailing.domain.shared.android</artifactId>
|
</parent>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<artifactId>com.sap.sailing.domain.shared.android</artifactId>
|
||||||
<build>
|
<packaging>eclipse-plugin</packaging>
|
||||||
<plugins>
|
<build>
|
||||||
<plugin>
|
<plugins>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<plugin>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<version>${tycho-version}</version>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
<configuration>
|
<version>${tycho-version}</version>
|
||||||
<source>1.7</source>
|
<configuration>
|
||||||
<target>1.7</target>
|
<source>1.7</source>
|
||||||
</configuration>
|
<target>1.7</target>
|
||||||
</plugin>
|
</configuration>
|
||||||
<plugin>
|
</plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<plugin>
|
||||||
<artifactId>tycho-source-plugin</artifactId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<version>${tycho-version}</version>
|
<artifactId>tycho-source-plugin</artifactId>
|
||||||
<executions>
|
<version>${tycho-version}</version>
|
||||||
<execution>
|
<executions>
|
||||||
<id>plugin-source</id>
|
<execution>
|
||||||
<phase>generate-sources</phase>
|
<id>plugin-source</id>
|
||||||
<goals>
|
<phase>generate-sources</phase>
|
||||||
<goal>plugin-source</goal>
|
<goals>
|
||||||
</goals>
|
<goal>plugin-source</goal>
|
||||||
</execution>
|
</goals>
|
||||||
</executions>
|
</execution>
|
||||||
</plugin>
|
</executions>
|
||||||
</plugins>
|
</plugin>
|
||||||
</build>
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<version>4.3.0</version>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
+197
-198
@@ -1,211 +1,210 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project
|
<project
|
||||||
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"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>root</artifactId>
|
<artifactId>root</artifactId>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<packaging>eclipse-plugin</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- The following dependency needs re-declaration with the desired version
|
<!-- The following dependency needs re-declaration with the desired version
|
||||||
because gwt-maps-api declares it with no version specifier which may be resolved
|
because gwt-maps-api declares it with no version specifier which may be resolved
|
||||||
to an incorrect version. -->
|
to an incorrect version. -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.gwt</groupId>
|
<groupId>com.google.gwt</groupId>
|
||||||
<artifactId>gwt-user</artifactId>
|
<artifactId>gwt-user</artifactId>
|
||||||
<version>${gwt.version}</version>
|
<version>${gwt.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.gwt</groupId>
|
<groupId>com.google.gwt</groupId>
|
||||||
<artifactId>gwt-dev</artifactId>
|
<artifactId>gwt-dev</artifactId>
|
||||||
<version>${gwt.version}</version>
|
<version>${gwt.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.validation</groupId>
|
<groupId>javax.validation</groupId>
|
||||||
<artifactId>validation-api</artifactId>
|
<artifactId>validation-api</artifactId>
|
||||||
<version>1.0.0.GA</version>
|
<version>1.0.0.GA</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.validation</groupId>
|
<groupId>javax.validation</groupId>
|
||||||
<artifactId>validation-api</artifactId>
|
<artifactId>validation-api</artifactId>
|
||||||
<version>1.0.0.GA</version>
|
<version>1.0.0.GA</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<!-- This dependency is required because the GWT Maven Plugin searches
|
<!-- This dependency is required because the GWT Maven Plugin searches
|
||||||
other GWT modules only in Maven dependencies -->
|
other GWT modules only in Maven dependencies -->
|
||||||
<groupId>com.github.branflake2267</groupId>
|
<groupId>com.github.branflake2267</groupId>
|
||||||
<artifactId>gwt-maps-api</artifactId>
|
<artifactId>gwt-maps-api</artifactId>
|
||||||
<version>3.9.0-build-17</version>
|
<version>3.9.0-build-17</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.moxieapps.gwt</groupId>
|
<groupId>org.moxieapps.gwt</groupId>
|
||||||
<artifactId>org.moxieapps.gwt.highcharts</artifactId>
|
<artifactId>org.moxieapps.gwt.highcharts</artifactId>
|
||||||
<version>1.6.0-SNAPSHOT</version>
|
<version>1.6.0-SNAPSHOT</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.domain.common</artifactId>
|
<artifactId>com.sap.sailing.domain.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt</artifactId>
|
<artifactId>com.sap.sse.gwt</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt.theme</artifactId>
|
<artifactId>com.sap.sse.gwt.theme</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt.adminconsole</artifactId>
|
<artifactId>com.sap.sse.gwt.adminconsole</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.datamining.shared</artifactId>
|
<artifactId>com.sap.sailing.datamining.shared</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.datamining.shared</artifactId>
|
<artifactId>com.sap.sse.datamining.shared</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.datamining.annotations</artifactId>
|
<artifactId>com.sap.sse.datamining.annotations</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.polars.datamining.shared</artifactId>
|
<artifactId>com.sap.sailing.polars.datamining.shared</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.gwtbootstrap</groupId>
|
<groupId>com.github.gwtbootstrap</groupId>
|
||||||
<artifactId>gwt-bootstrap</artifactId>
|
<artifactId>gwt-bootstrap</artifactId>
|
||||||
<version>2.3.2.0</version>
|
<version>2.3.2.0</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.security.common</artifactId>
|
<artifactId>com.sap.sse.security.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.security.ui</artifactId>
|
<artifactId>com.sap.sse.security.ui</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
</dependencies>
|
<build>
|
||||||
|
<plugins>
|
||||||
<build>
|
<plugin>
|
||||||
<plugins>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<plugin>
|
<artifactId>gwt-maven-plugin</artifactId>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<version>${gwt.version}</version>
|
||||||
<artifactId>gwt-maven-plugin</artifactId>
|
<executions>
|
||||||
<version>${gwt.version}</version>
|
<!-- GWT version detected from dependencyManagement -->
|
||||||
<executions>
|
<execution>
|
||||||
<!-- GWT version detected from dependencyManagement -->
|
<configuration>
|
||||||
<execution>
|
<!-- <userAgents>chrome</userAgents> -->
|
||||||
<configuration>
|
<modules>
|
||||||
<!-- <userAgents>chrome</userAgents> -->
|
<module>com.sap.sailing.gwt.home.Home</module>
|
||||||
<modules>
|
<module>com.sap.sailing.gwt.AutoPlay</module>
|
||||||
<module>com.sap.sailing.gwt.home.Home</module>
|
<module>com.sap.sailing.gwt.ui.AdminConsole</module>
|
||||||
<module>com.sap.sailing.gwt.AutoPlay</module>
|
<module>com.sap.sailing.gwt.ui.Leaderboard</module>
|
||||||
<module>com.sap.sailing.gwt.ui.AdminConsole</module>
|
<module>com.sap.sailing.gwt.ui.LeaderboardEditing</module>
|
||||||
<module>com.sap.sailing.gwt.ui.Leaderboard</module>
|
<module>com.sap.sailing.gwt.ui.RaceBoard</module>
|
||||||
<module>com.sap.sailing.gwt.ui.LeaderboardEditing</module>
|
<module>com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart</module>
|
||||||
<module>com.sap.sailing.gwt.ui.RaceBoard</module>
|
<module>com.sap.sailing.gwt.ui.Spectator</module>
|
||||||
<module>com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart</module>
|
<module>com.sap.sailing.gwt.ui.DataMining</module>
|
||||||
<module>com.sap.sailing.gwt.ui.Spectator</module>
|
<module>com.sap.sailing.gwt.ui.VideoPopup</module>
|
||||||
<module>com.sap.sailing.gwt.ui.DataMining</module>
|
<module>com.sap.sailing.gwt.ui.YoutubePopup</module>
|
||||||
<module>com.sap.sailing.gwt.ui.VideoPopup</module>
|
<module>com.sap.sailing.gwt.ui.Simulator</module>
|
||||||
<module>com.sap.sailing.gwt.ui.YoutubePopup</module>
|
<module>com.sap.sailing.gwt.regattaoverview.RegattaOverview</module>
|
||||||
<module>com.sap.sailing.gwt.ui.Simulator</module>
|
</modules>
|
||||||
<module>com.sap.sailing.gwt.regattaoverview.RegattaOverview</module>
|
|
||||||
</modules>
|
|
||||||
<!-- uncomment the following for PRETTY-printed, non-obfuscated output
|
<!-- uncomment the following for PRETTY-printed, non-obfuscated output
|
||||||
format <style>PRETTY</style> -->
|
format <style>PRETTY</style> -->
|
||||||
<gen>${basedir}/.generated</gen>
|
<gen>${basedir}/.generated</gen>
|
||||||
<webappDirectory>${basedir}</webappDirectory>
|
<webappDirectory>${basedir}</webappDirectory>
|
||||||
<warSourceDirectory>${basedir}/src/main/resources</warSourceDirectory>
|
<warSourceDirectory>${basedir}/src/main/resources</warSourceDirectory>
|
||||||
<!-- Uncomment the following to obtain details split-point reports
|
<!-- Uncomment the following to obtain details split-point reports
|
||||||
<compileReport>true</compileReport> <detailedSoyc>true</detailedSoyc> -->
|
<compileReport>true</compileReport> <detailedSoyc>true</detailedSoyc> -->
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-source-plugin</artifactId>
|
<artifactId>tycho-source-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>plugin-source</id>
|
<id>plugin-source</id>
|
||||||
<phase>generate-sources</phase>
|
<phase>generate-sources</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>plugin-source</goal>
|
<goal>plugin-source</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>debug.no-gwt-compile</id>
|
<id>debug.no-gwt-compile</id>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>gwt-maven-plugin</artifactId>
|
<artifactId>gwt-maven-plugin</artifactId>
|
||||||
<version>${gwt.version}</version>
|
<version>${gwt.version}</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<configuration combine.self="override">
|
<configuration combine.self="override">
|
||||||
<modules>
|
<modules>
|
||||||
</modules>
|
</modules>
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>help</goal>
|
<goal>help</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.json.simple"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -22,4 +22,26 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<?pde version="3.8"?><target name="empty" sequenceNumber="-1"/>
|
||||||
@@ -12,32 +12,4 @@
|
|||||||
|
|
||||||
<artifactId>com.sap.sailing.www</artifactId>
|
<artifactId>com.sap.sailing.www</artifactId>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<packaging>eclipse-plugin</packaging>
|
||||||
|
|
||||||
<!-- Optional depedency to delay build after apk has been deployed to apps/
|
|
||||||
folder -->
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<!-- deactivate with parameter '-P !with-mobile' -->
|
|
||||||
<id>with-mobile</id>
|
|
||||||
<activation>
|
|
||||||
<activeByDefault>true</activeByDefault>
|
|
||||||
</activation>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>com.sap.sailing.racecommittee.app</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>com.sap.sailing.android.tracking.app</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.json.simple"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -1,40 +1,63 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project 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"
|
<project
|
||||||
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"
|
||||||
<modelVersion>4.0.0</modelVersion>
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<parent>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>root</artifactId>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<artifactId>root</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<groupId>com.sap.sailing</groupId>
|
||||||
</parent>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
</parent>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
|
<packaging>eclipse-plugin</packaging>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.7</source>
|
||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-source-plugin</artifactId>
|
<artifactId>tycho-source-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>plugin-source</id>
|
<id>plugin-source</id>
|
||||||
<phase>generate-sources</phase>
|
<phase>generate-sources</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>plugin-source</goal>
|
<goal>plugin-source</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.sap.sse.datamining.annotations"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -28,4 +28,26 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -25,13 +25,13 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt</artifactId>
|
<artifactId>com.sap.sse.gwt</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.sap.sse.security.common"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -28,5 +28,26 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -25,25 +25,25 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.gwt</artifactId>
|
<artifactId>com.sap.sse.gwt</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.security</artifactId>
|
<artifactId>com.sap.sse.security</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.security.common</artifactId>
|
<artifactId>com.sap.sse.security.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.sap.sse.shared.android"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -22,4 +22,26 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.json.simple"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.1.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -1,40 +1,64 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project 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"
|
<project
|
||||||
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"
|
||||||
<modelVersion>4.0.0</modelVersion>
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<parent>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>root</artifactId>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<artifactId>root</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<groupId>com.sap.sailing</groupId>
|
||||||
</parent>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<artifactId>org.json.simple</artifactId>
|
</parent>
|
||||||
<version>1.1.0-SNAPSHOT</version>
|
<artifactId>org.json.simple</artifactId>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<version>1.1.0-SNAPSHOT</version>
|
||||||
<build>
|
<packaging>eclipse-plugin</packaging>
|
||||||
<plugins>
|
<build>
|
||||||
<plugin>
|
<plugins>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<plugin>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<version>${tycho-version}</version>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
<configuration>
|
<version>${tycho-version}</version>
|
||||||
<source>1.7</source>
|
<configuration>
|
||||||
<target>1.7</target>
|
<source>1.7</source>
|
||||||
</configuration>
|
<target>1.7</target>
|
||||||
</plugin>
|
</configuration>
|
||||||
<plugin>
|
</plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<plugin>
|
||||||
<artifactId>tycho-source-plugin</artifactId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<version>${tycho-version}</version>
|
<artifactId>tycho-source-plugin</artifactId>
|
||||||
<executions>
|
<version>${tycho-version}</version>
|
||||||
<execution>
|
<executions>
|
||||||
<id>plugin-source</id>
|
<execution>
|
||||||
<phase>generate-sources</phase>
|
<id>plugin-source</id>
|
||||||
<goals>
|
<phase>generate-sources</phase>
|
||||||
<goal>plugin-source</goal>
|
<goals>
|
||||||
</goals>
|
<goal>plugin-source</goal>
|
||||||
</execution>
|
</goals>
|
||||||
</executions>
|
</execution>
|
||||||
</plugin>
|
</executions>
|
||||||
</plugins>
|
</plugin>
|
||||||
</build>
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>with-mobile</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
Executable → Regular
+443
-307
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
|
<project 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">
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
@@ -13,133 +13,17 @@
|
|||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>com.sap.sse</module>
|
<!-- By default, only the modules are added that are always needed.
|
||||||
|
These are the module that are needed for both backend and Android builds.
|
||||||
|
To add additional modules for the backend build, there is a specific profile. -->
|
||||||
<module>com.sap.sse.common</module>
|
<module>com.sap.sse.common</module>
|
||||||
<module>com.sap.sse.shared.android</module>
|
<module>com.sap.sse.shared.android</module>
|
||||||
<module>com.sap.sse.mail</module>
|
|
||||||
<module>com.sap.sse.mail.replication.test</module>
|
|
||||||
<module>com.sap.sse.mail.replication.testsupport</module>
|
|
||||||
<module>com.sap.sse.mongodb</module>
|
|
||||||
<module>com.sap.sse.gwt</module>
|
|
||||||
<module>com.sap.sse.gwt.adminconsole</module>
|
|
||||||
<module>com.sap.sse.datamining</module>
|
|
||||||
<module>com.sap.sse.datamining.annotations</module>
|
<module>com.sap.sse.datamining.annotations</module>
|
||||||
<module>com.sap.sse.datamining.shared</module>
|
|
||||||
<module>com.sap.sse.security</module>
|
|
||||||
<module>com.sap.sse.security.common</module>
|
<module>com.sap.sse.security.common</module>
|
||||||
<module>com.sap.sse.security.ui</module>
|
<module>org.json.simple</module>
|
||||||
<module>com.sap.sse.security.userstore.mongodb</module>
|
|
||||||
<module>com.sap.sse.operationaltransformation</module>
|
|
||||||
<module>com.sap.sse.replication</module>
|
|
||||||
<module>com.sap.sse.threadmanager</module>
|
|
||||||
<module>com.sap.sse.filestorage</module>
|
|
||||||
<module>com.sap.sse.gwt.theme</module>
|
|
||||||
<module>com.sap.sailing.domain.common</module>
|
<module>com.sap.sailing.domain.common</module>
|
||||||
<module>com.sap.sailing.domain.shared.android</module>
|
<module>com.sap.sailing.domain.shared.android</module>
|
||||||
<module>com.sap.sailing.domain</module>
|
|
||||||
<module>com.sap.sailing.geocoding</module>
|
|
||||||
<module>com.sap.sailing.datamining</module>
|
|
||||||
<module>com.sap.sailing.datamining.shared</module>
|
|
||||||
<module>com.sap.sailing.domain.persistence</module>
|
|
||||||
<module>com.sap.sailing.domain.deckmanadapter</module>
|
|
||||||
<module>com.sap.sailing.domain.tractracadapter</module>
|
|
||||||
<module>com.sap.sailing.domain.tractracadapter.persistence</module>
|
|
||||||
<module>com.sap.sailing.domain.igtimiadapter</module>
|
|
||||||
<module>com.sap.sailing.domain.igtimiadapter.persistence</module>
|
|
||||||
<module>com.sap.sailing.domain.racelogtrackingadapter</module>
|
|
||||||
<module>com.sap.sailing.domain.racelogtrackingadapter.testsupport</module>
|
|
||||||
<module>com.sap.sailing.domain.swisstimingadapter</module>
|
|
||||||
<module>com.sap.sailing.domain.swisstimingadapter.persistence</module>
|
|
||||||
<module>com.sap.sailing.domain.swisstimingreplayadapter</module>
|
|
||||||
<module>com.sap.sailing.news</module>
|
|
||||||
<module>com.sap.sailing.declination</module>
|
|
||||||
<module>com.sap.sailing.udpconnector</module>
|
|
||||||
<module>com.sap.sailing.expeditionconnector</module>
|
|
||||||
<module>com.sap.sailing.server</module>
|
|
||||||
<module>com.sap.sailing.server.gateway</module>
|
|
||||||
<module>com.sap.sailing.server.gateway.serialization</module>
|
|
||||||
<module>com.sap.sailing.server.gateway.serialization.shared.android</module>
|
<module>com.sap.sailing.server.gateway.serialization.shared.android</module>
|
||||||
<module>com.sap.sailing.www</module>
|
|
||||||
<module>com.sap.sailing.www.events</module>
|
|
||||||
<module>com.sap.sailing.xmlexport</module>
|
|
||||||
<module>com.google.gwt.dev</module>
|
|
||||||
<module>com.google.gwt.osgi</module>
|
|
||||||
<module>com.tractrac.clientmodule</module>
|
|
||||||
<module>org.json.simple</module>
|
|
||||||
<module>com.googlecode.java-diff-utils</module>
|
|
||||||
<module>com.googlecode.mgwt</module>
|
|
||||||
<module>com.sap.sailing.dashboards.gwt</module>
|
|
||||||
<module>com.sap.sailing.feature</module>
|
|
||||||
<module>org.moxieapps.gwt.highcharts</module>
|
|
||||||
<module>com.sap.sailing.resultimport</module>
|
|
||||||
<module>com.sap.sailing.kiworesultimport</module>
|
|
||||||
<module>com.sap.sailing.ess40.resultimport</module>
|
|
||||||
<module>com.sap.sailing.xrr.schema</module>
|
|
||||||
<module>com.sap.sailing.xrr.resultimport</module>
|
|
||||||
<module>com.sap.sailing.xrr.structureimport</module>
|
|
||||||
<module>com.sap.sailing.freg.resultimport</module>
|
|
||||||
<module>org.openqa.selenium.osgi</module>
|
|
||||||
<module>com.sap.sailing.monitoring</module>
|
|
||||||
<module>com.sap.sailing.simulator</module>
|
|
||||||
<module>com.sap.sailing.server.trackfiles</module>
|
|
||||||
<module>com.sap.sailing.feature.runtime</module>
|
|
||||||
<module>com.sap.sailing.gwt.ui</module>
|
|
||||||
<module>com.sap.sailing.domain.test</module>
|
|
||||||
<module>com.sap.sse.replication.testsupport</module>
|
|
||||||
<!-- The following test fragment doesn't yet do what it should in the Maven context... -->
|
|
||||||
<module>com.sap.sse.gwt.test</module>
|
|
||||||
<!-- -->
|
|
||||||
<module>com.sap.sse.datamining.test</module>
|
|
||||||
<module>com.sap.sse.security.replication.test</module>
|
|
||||||
<module>com.sap.sse.security.test</module>
|
|
||||||
<module>com.sap.sse.operationaltransformation.test</module>
|
|
||||||
<module>com.sap.sse.common.test</module>
|
|
||||||
<module>com.sap.sse.filestorage.test</module>
|
|
||||||
<module>com.sap.sailing.datamining.test</module>
|
|
||||||
<module>com.sap.sailing.domain.deckmanadapter.test</module>
|
|
||||||
<module>com.sap.sailing.domain.igtimiadapter.test</module>
|
|
||||||
<module>com.sap.sailing.domain.racelogtrackingadapter.test</module>
|
|
||||||
<module>com.sap.sailing.xmlexport.test</module>
|
|
||||||
<module>com.sap.sailing.xrr.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.domain.shared.android.test</module>
|
|
||||||
<module>com.sap.sailing.geocoding.test</module>
|
|
||||||
<module>com.sap.sailing.domain.swisstimingadapter.test</module>
|
|
||||||
<module>com.sap.sailing.domain.swisstimingreplayadapter.test</module>
|
|
||||||
<module>com.sap.sailing.declination.test</module>
|
|
||||||
<module>com.sap.sailing.expeditionconnector.test</module>
|
|
||||||
<module>com.sap.sailing.server.test</module>
|
|
||||||
<module>com.sap.sailing.server.gateway.test</module>
|
|
||||||
<module>com.sap.sailing.server.gateway.test.support</module>
|
|
||||||
<module>com.sap.sailing.server.gateway.serialization.test</module>
|
|
||||||
<module>com.sap.sailing.server.replication.test</module>
|
|
||||||
<module>com.sap.sailing.gwt.ui.test</module>
|
|
||||||
<module>com.sap.sailing.mongodb.test</module>
|
|
||||||
<module>com.googlecode.java-diff-utils.test</module>
|
|
||||||
<module>com.sap.sailing.kiworesultimport.test</module>
|
|
||||||
<module>com.sap.sailing.ess40.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.freg.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.barbados.resultimport</module>
|
|
||||||
<module>com.sap.sailing.barbados.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.velum.resultimport</module>
|
|
||||||
<module>com.sap.sailing.velum.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.sailwave.resultimport</module>
|
|
||||||
<module>com.sap.sailing.sailwave.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.manage2sail</module>
|
|
||||||
<module>com.sap.sailing.manage2sail.resultimport</module>
|
|
||||||
<module>com.sap.sailing.manage2sail.resultimport.test</module>
|
|
||||||
<module>com.sap.sailing.simulator.test</module>
|
|
||||||
<module>com.sap.sailing.server.trackfiles.test</module>
|
|
||||||
<module>com.sap.sailing.selenium.test</module>
|
|
||||||
<module>com.sap.sailing.autoload</module>
|
|
||||||
<module>com.sap.sailing.feature.p2build</module>
|
|
||||||
<module>com.sap.sailing.polars</module>
|
|
||||||
<module>com.sap.sailing.polars.datamining</module>
|
|
||||||
<module>com.sap.sailing.polars.datamining.shared</module>
|
|
||||||
<module>com.sap.sailing.polars.test</module>
|
|
||||||
<!--
|
|
||||||
com.sap.sailing.targetplatform.base
|
|
||||||
left out on purpose: only invoke maven manually to build target platform
|
|
||||||
-->
|
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -148,9 +32,9 @@
|
|||||||
<gwt.minVersion>2.7.0</gwt.minVersion>
|
<gwt.minVersion>2.7.0</gwt.minVersion>
|
||||||
<gwt.workers>2</gwt.workers>
|
<gwt.workers>2</gwt.workers>
|
||||||
<p2-target>race-analysis-p2-remote</p2-target><!--can be overidden through p2-target.local profile -->
|
<p2-target>race-analysis-p2-remote</p2-target><!--can be overidden through p2-target.local profile -->
|
||||||
<!-- QUESTION: Which properties or settings are system dependent and differ across different machines/environments? QUESTION:
|
<!-- QUESTION: Which properties or settings are system dependent and differ across different machines/environments? QUESTION:
|
||||||
Can we move the system property -Dmongo.dbName to "parameters.mongodb"? If so the IP of the host would be the same for all
|
Can we move the system property -Dmongo.dbName to "parameters.mongodb"? If so the IP of the host would be the same for all
|
||||||
profiles. -->
|
profiles. -->
|
||||||
<parameters.common>
|
<parameters.common>
|
||||||
-Dfile.encoding=cp1252 -Dmongo.dbName=winddbTest -DspatialWind=true
|
-Dfile.encoding=cp1252 -Dmongo.dbName=winddbTest -DspatialWind=true
|
||||||
</parameters.common>
|
</parameters.common>
|
||||||
@@ -166,8 +50,8 @@
|
|||||||
<parameters.debug>
|
<parameters.debug>
|
||||||
-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
|
-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
|
||||||
</parameters.debug>
|
</parameters.debug>
|
||||||
<!-- "Forward declaration" for better readability. The actual value should be defined in the local settings.xml, because
|
<!-- "Forward declaration" for better readability. The actual value should be defined in the local settings.xml, because
|
||||||
of the differences between the CI-Build and the local setup. -->
|
of the differences between the CI-Build and the local setup. -->
|
||||||
<parameters.proxy>
|
<parameters.proxy>
|
||||||
-Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy.wdf.sap.corp -Dhttps.proxyPort=8080
|
-Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy.wdf.sap.corp -Dhttps.proxyPort=8080
|
||||||
</parameters.proxy>
|
</parameters.proxy>
|
||||||
@@ -177,213 +61,465 @@
|
|||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>no-debug.with-proxy</id>
|
<!-- This profile activates some configuration (submodules and Tycho) that must not be active when building the Android apps.
|
||||||
<activation>
|
On Lean DI this profile is inactive.
|
||||||
<activeByDefault>true</activeByDefault>
|
In a non Lean DI environment this is active by default and can be deactivated using the parameter "-P !with-not-android-relevant". -->
|
||||||
</activation>
|
<id>with-not-android-relevant</id>
|
||||||
<properties>
|
|
||||||
<tycho.build.argLine>
|
|
||||||
${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.tractrac} ${parameters.mongodb}
|
|
||||||
</tycho.build.argLine>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>no-debug.without-proxy</id>
|
|
||||||
<properties>
|
|
||||||
<tycho.build.argLine>
|
|
||||||
${parameters.common} ${parameters.vm-settings} ${parameters.mongodb}
|
|
||||||
</tycho.build.argLine>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>debug.with-proxy</id>
|
|
||||||
<properties>
|
|
||||||
<tycho.build.argLine>
|
|
||||||
${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.debug} ${parameters.mongodb}
|
|
||||||
</tycho.build.argLine>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>debug.without-proxy</id>
|
|
||||||
<properties>
|
|
||||||
<tycho.build.argLine>
|
|
||||||
${parameters.common} ${parameters.vm-settings} ${parameters.debug} ${parameters.mongodb}
|
|
||||||
</tycho.build.argLine>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>p2-target.local</id>
|
|
||||||
<properties>
|
|
||||||
<p2-target>
|
|
||||||
race-analysis-p2-local
|
|
||||||
</p2-target>
|
|
||||||
</properties>
|
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>p2-local</name><!-- activiated by ``mvn -Dp2-local`` -->
|
<name>!ldi.releaseBuild</name>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
</profile>
|
<modules>
|
||||||
</profiles>
|
<module>com.sap.sse</module>
|
||||||
|
<module>com.sap.sse.mail</module>
|
||||||
<build>
|
<module>com.sap.sse.mail.replication.test</module>
|
||||||
<directory>bin</directory>
|
<module>com.sap.sse.mail.replication.testsupport</module>
|
||||||
<outputDirectory>bin</outputDirectory>
|
<module>com.sap.sse.mongodb</module>
|
||||||
<testOutputDirectory>bin</testOutputDirectory>
|
<module>com.sap.sse.gwt</module>
|
||||||
|
<module>com.sap.sse.gwt.adminconsole</module>
|
||||||
<pluginManagement>
|
<module>com.sap.sse.datamining</module>
|
||||||
|
<module>com.sap.sse.datamining.shared</module>
|
||||||
|
<module>com.sap.sse.security</module>
|
||||||
|
<module>com.sap.sse.security.ui</module>
|
||||||
|
<module>com.sap.sse.security.userstore.mongodb</module>
|
||||||
|
<module>com.sap.sse.operationaltransformation</module>
|
||||||
|
<module>com.sap.sse.replication</module>
|
||||||
|
<module>com.sap.sse.threadmanager</module>
|
||||||
|
<module>com.sap.sse.filestorage</module>
|
||||||
|
<module>com.sap.sse.gwt.theme</module>
|
||||||
|
<module>com.sap.sailing.domain</module>
|
||||||
|
<module>com.sap.sailing.geocoding</module>
|
||||||
|
<module>com.sap.sailing.datamining</module>
|
||||||
|
<module>com.sap.sailing.datamining.shared</module>
|
||||||
|
<module>com.sap.sailing.domain.persistence</module>
|
||||||
|
<module>com.sap.sailing.domain.deckmanadapter</module>
|
||||||
|
<module>com.sap.sailing.domain.tractracadapter</module>
|
||||||
|
<module>com.sap.sailing.domain.tractracadapter.persistence</module>
|
||||||
|
<module>com.sap.sailing.domain.igtimiadapter</module>
|
||||||
|
<module>com.sap.sailing.domain.igtimiadapter.persistence</module>
|
||||||
|
<module>com.sap.sailing.domain.racelogtrackingadapter</module>
|
||||||
|
<module>com.sap.sailing.domain.racelogtrackingadapter.testsupport</module>
|
||||||
|
<module>com.sap.sailing.domain.swisstimingadapter</module>
|
||||||
|
<module>com.sap.sailing.domain.swisstimingadapter.persistence</module>
|
||||||
|
<module>com.sap.sailing.domain.swisstimingreplayadapter</module>
|
||||||
|
<module>com.sap.sailing.news</module>
|
||||||
|
<module>com.sap.sailing.declination</module>
|
||||||
|
<module>com.sap.sailing.udpconnector</module>
|
||||||
|
<module>com.sap.sailing.expeditionconnector</module>
|
||||||
|
<module>com.sap.sailing.server</module>
|
||||||
|
<module>com.sap.sailing.server.gateway</module>
|
||||||
|
<module>com.sap.sailing.server.gateway.serialization</module>
|
||||||
|
<module>com.sap.sailing.www</module>
|
||||||
|
<module>com.sap.sailing.www.events</module>
|
||||||
|
<module>com.sap.sailing.xmlexport</module>
|
||||||
|
<module>com.google.gwt.dev</module>
|
||||||
|
<module>com.google.gwt.osgi</module>
|
||||||
|
<module>com.tractrac.clientmodule</module>
|
||||||
|
<module>com.googlecode.java-diff-utils</module>
|
||||||
|
<module>com.googlecode.mgwt</module>
|
||||||
|
<module>com.sap.sailing.dashboards.gwt</module>
|
||||||
|
<module>com.sap.sailing.feature</module>
|
||||||
|
<module>org.moxieapps.gwt.highcharts</module>
|
||||||
|
<module>com.sap.sailing.resultimport</module>
|
||||||
|
<module>com.sap.sailing.kiworesultimport</module>
|
||||||
|
<module>com.sap.sailing.ess40.resultimport</module>
|
||||||
|
<module>com.sap.sailing.xrr.schema</module>
|
||||||
|
<module>com.sap.sailing.xrr.resultimport</module>
|
||||||
|
<module>com.sap.sailing.xrr.structureimport</module>
|
||||||
|
<module>com.sap.sailing.freg.resultimport</module>
|
||||||
|
<module>org.openqa.selenium.osgi</module>
|
||||||
|
<module>com.sap.sailing.monitoring</module>
|
||||||
|
<module>com.sap.sailing.simulator</module>
|
||||||
|
<module>com.sap.sailing.server.trackfiles</module>
|
||||||
|
<module>com.sap.sailing.feature.runtime</module>
|
||||||
|
<module>com.sap.sailing.gwt.ui</module>
|
||||||
|
<module>com.sap.sailing.domain.test</module>
|
||||||
|
<module>com.sap.sse.replication.testsupport</module>
|
||||||
|
<!-- The following test fragment doesn't yet do what it should in the Maven context... -->
|
||||||
|
<module>com.sap.sse.gwt.test</module>
|
||||||
|
<!-- -->
|
||||||
|
<module>com.sap.sse.datamining.test</module>
|
||||||
|
<module>com.sap.sse.security.replication.test</module>
|
||||||
|
<module>com.sap.sse.security.test</module>
|
||||||
|
<module>com.sap.sse.operationaltransformation.test</module>
|
||||||
|
<module>com.sap.sse.common.test</module>
|
||||||
|
<module>com.sap.sse.filestorage.test</module>
|
||||||
|
<module>com.sap.sailing.datamining.test</module>
|
||||||
|
<module>com.sap.sailing.domain.deckmanadapter.test</module>
|
||||||
|
<module>com.sap.sailing.domain.igtimiadapter.test</module>
|
||||||
|
<module>com.sap.sailing.domain.racelogtrackingadapter.test</module>
|
||||||
|
<module>com.sap.sailing.xmlexport.test</module>
|
||||||
|
<module>com.sap.sailing.xrr.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.domain.shared.android.test</module>
|
||||||
|
<module>com.sap.sailing.geocoding.test</module>
|
||||||
|
<module>com.sap.sailing.domain.swisstimingadapter.test</module>
|
||||||
|
<module>com.sap.sailing.domain.swisstimingreplayadapter.test</module>
|
||||||
|
<module>com.sap.sailing.declination.test</module>
|
||||||
|
<module>com.sap.sailing.expeditionconnector.test</module>
|
||||||
|
<module>com.sap.sailing.server.test</module>
|
||||||
|
<module>com.sap.sailing.server.gateway.test</module>
|
||||||
|
<module>com.sap.sailing.server.gateway.test.support</module>
|
||||||
|
<module>com.sap.sailing.server.gateway.serialization.test</module>
|
||||||
|
<module>com.sap.sailing.server.replication.test</module>
|
||||||
|
<module>com.sap.sailing.gwt.ui.test</module>
|
||||||
|
<module>com.sap.sailing.mongodb.test</module>
|
||||||
|
<module>com.googlecode.java-diff-utils.test</module>
|
||||||
|
<module>com.sap.sailing.kiworesultimport.test</module>
|
||||||
|
<module>com.sap.sailing.ess40.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.freg.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.barbados.resultimport</module>
|
||||||
|
<module>com.sap.sailing.barbados.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.velum.resultimport</module>
|
||||||
|
<module>com.sap.sailing.velum.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.sailwave.resultimport</module>
|
||||||
|
<module>com.sap.sailing.sailwave.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.manage2sail</module>
|
||||||
|
<module>com.sap.sailing.manage2sail.resultimport</module>
|
||||||
|
<module>com.sap.sailing.manage2sail.resultimport.test</module>
|
||||||
|
<module>com.sap.sailing.simulator.test</module>
|
||||||
|
<module>com.sap.sailing.server.trackfiles.test</module>
|
||||||
|
<module>com.sap.sailing.selenium.test</module>
|
||||||
|
<module>com.sap.sailing.autoload</module>
|
||||||
|
<module>com.sap.sailing.feature.p2build</module>
|
||||||
|
<module>com.sap.sailing.polars</module>
|
||||||
|
<module>com.sap.sailing.polars.datamining</module>
|
||||||
|
<module>com.sap.sailing.polars.datamining.shared</module>
|
||||||
|
<module>com.sap.sailing.polars.test</module>
|
||||||
|
<!--
|
||||||
|
com.sap.sailing.targetplatform.base
|
||||||
|
left out on purpose: only invoke maven manually to build target platform
|
||||||
|
-->
|
||||||
|
</modules>
|
||||||
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<inherited>true</inherited>
|
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>eclipse-test-plugin</artifactId>
|
<artifactId>target-platform-configuration</artifactId>
|
||||||
<version>${tycho-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<version>2.16</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
<dependency-resolution>
|
||||||
|
<extraRequirements>
|
||||||
|
<requirement>
|
||||||
|
<type>eclipse-plugin</type>
|
||||||
|
<id>com.google.gwt.dev</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
</extraRequirements>
|
||||||
|
</dependency-resolution>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</build>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>no-debug.with-proxy</id>
|
||||||
|
<activation>
|
||||||
|
<activeByDefault>true</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<tycho.build.argLine>
|
||||||
|
${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.tractrac} ${parameters.mongodb}
|
||||||
|
</tycho.build.argLine>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>no-debug.without-proxy</id>
|
||||||
|
<properties>
|
||||||
|
<tycho.build.argLine>
|
||||||
|
${parameters.common} ${parameters.vm-settings} ${parameters.mongodb}
|
||||||
|
</tycho.build.argLine>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>debug.with-proxy</id>
|
||||||
|
<properties>
|
||||||
|
<tycho.build.argLine>
|
||||||
|
${parameters.common} ${parameters.vm-settings} ${parameters.proxy} ${parameters.debug} ${parameters.mongodb}
|
||||||
|
</tycho.build.argLine>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>debug.without-proxy</id>
|
||||||
|
<properties>
|
||||||
|
<tycho.build.argLine>
|
||||||
|
${parameters.common} ${parameters.vm-settings} ${parameters.debug} ${parameters.mongodb}
|
||||||
|
</tycho.build.argLine>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>p2-target.local</id>
|
||||||
|
<properties>
|
||||||
|
<p2-target>
|
||||||
|
race-analysis-p2-local
|
||||||
|
</p2-target>
|
||||||
|
</properties>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>p2-local</name><!-- activiated by ``mvn -Dp2-local`` -->
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi</id>
|
||||||
|
<activation>
|
||||||
|
<!-- Only active on Lean DI. -->
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<!-- On Lean DI we do not build any artifact that needs stuff from the target platform.
|
||||||
|
To avoid problems during target platform resolution,
|
||||||
|
we use an empty target platform file that simply doesn't reference any artifacts.
|
||||||
|
The alternative would be to completely deactivate some Tycho configuration on Lean DI,
|
||||||
|
but this would be much more complex and fragile. -->
|
||||||
|
<p2-target>race-analysis-p2-empty</p2-target>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<!-- This dependency simply ensures, that the Android SDK installation is completed on Lean DI before anything else is being built. -->
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<artifactId>install-android-sdk</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<type>pom</type>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- Toolchan stuff doesn't work on Lean DI,
|
||||||
|
so we need to hard-code Java 1.7 (Android 5.1 SDK isn't compatible with Java 8)
|
||||||
|
compatibility for all builds. -->
|
||||||
|
<source>1.7</source>
|
||||||
|
<target>1.7</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>non-leandi</id>
|
||||||
|
<activation>
|
||||||
|
<!-- Only active in non Lean DI environments. -->
|
||||||
|
<property>
|
||||||
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<!-- On Lean DI, the toolchains stuff isn't correctly configured, so this can only be used if it isn't a Lean DI build. -->
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<useJDK>BREE</useJDK>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<directory>bin</directory>
|
||||||
|
<outputDirectory>bin</outputDirectory>
|
||||||
|
<testOutputDirectory>bin</testOutputDirectory>
|
||||||
|
|
||||||
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<inherited>true</inherited>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-maven-plugin</artifactId>
|
<artifactId>eclipse-test-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>${tycho-version}</version>
|
||||||
<extensions>true</extensions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>target-platform-configuration</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<version>2.16</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<resolver>p2</resolver>
|
|
||||||
<dependency-resolution>
|
|
||||||
<extraRequirements>
|
|
||||||
<requirement>
|
|
||||||
<type>eclipse-plugin</type>
|
|
||||||
<id>com.google.gwt.dev</id>
|
|
||||||
<versionRange>0.0.0</versionRange>
|
|
||||||
</requirement>
|
|
||||||
</extraRequirements>
|
|
||||||
</dependency-resolution>
|
|
||||||
<target>
|
|
||||||
<artifact>
|
|
||||||
<groupId>${project.groupId}</groupId>
|
|
||||||
<artifactId>${project.artifactId}</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<classifier>../com.sap.sailing.targetplatform/definitions/${p2-target}</classifier>
|
|
||||||
</artifact>
|
|
||||||
</target>
|
|
||||||
<environments>
|
|
||||||
<environment>
|
|
||||||
<os>linux</os>
|
|
||||||
<ws>gtk</ws>
|
|
||||||
<arch>x86</arch>
|
|
||||||
</environment>
|
|
||||||
<environment>
|
|
||||||
<os>linux</os>
|
|
||||||
<ws>gtk</ws>
|
|
||||||
<arch>x86_64</arch>
|
|
||||||
</environment>
|
|
||||||
<environment>
|
|
||||||
<os>win32</os>
|
|
||||||
<ws>win32</ws>
|
|
||||||
<arch>x86</arch>
|
|
||||||
</environment>
|
|
||||||
<environment>
|
|
||||||
<os>win32</os>
|
|
||||||
<ws>win32</ws>
|
|
||||||
<arch>x86_64</arch>
|
|
||||||
</environment>
|
|
||||||
<environment>
|
|
||||||
<os>macosx</os>
|
|
||||||
<ws>cocoa</ws>
|
|
||||||
<arch>x86_64</arch>
|
|
||||||
</environment>
|
|
||||||
</environments>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
|
||||||
<artifactId>tycho-surefire-plugin</artifactId>
|
|
||||||
<version>${tycho-version}</version>
|
|
||||||
<configuration>
|
|
||||||
<argLine>${tycho.build.argLine}</argLine>
|
|
||||||
<excludes>
|
|
||||||
<!-- Exclude inner classes -->
|
|
||||||
<exclude>**/*$*</exclude>
|
|
||||||
</excludes>
|
|
||||||
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
<version>${tycho-version}</version>
|
<configuration>
|
||||||
<configuration>
|
<sourceDirectories>src</sourceDirectories>
|
||||||
<useJDK>BREE</useJDK>
|
<destinationManifestFile>AndroidManifest.xml</destinationManifestFile>
|
||||||
</configuration>
|
<classesJarExcludes>
|
||||||
</plugin>
|
<classesJarExclude>*.jar</classesJarExclude>
|
||||||
|
<classesJarExclude>generated-sources/**</classesJarExclude>
|
||||||
|
<classesJarExclude>maven-archiver/**</classesJarExclude>
|
||||||
<plugin>
|
<classesJarExclude>sourcebundle-l10n-gen/**</classesJarExclude>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<classesJarExclude>p2*</classesJarExclude>
|
||||||
<artifactId>gwt-maven-plugin</artifactId>
|
<classesJarExclude>MANIFEST.MF</classesJarExclude>
|
||||||
<version>${gwt.version}</version>
|
<classesJarExclude>*.ap_</classesJarExclude>
|
||||||
<executions>
|
<classesJarExclude>local-artifacts.properties</classesJarExclude>
|
||||||
<!-- GWT version detected from dependencyManagement -->
|
<classesJarExclude>**/*.gwt.xml</classesJarExclude>
|
||||||
<execution>
|
</classesJarExcludes>
|
||||||
<configuration>
|
</configuration>
|
||||||
<extraJvmArgs>-Dgwt.persistentunitcache=false -Xmx2048m</extraJvmArgs>
|
<executions>
|
||||||
<!--
|
<execution>
|
||||||
<userAgents>chrome</userAgents>
|
<id>aar</id>
|
||||||
-->
|
<goals>
|
||||||
<!--
|
<goal>aar</goal>
|
||||||
<style>PRETTY</style>
|
</goals>
|
||||||
-->
|
</execution>
|
||||||
<localWorkers>${gwt.workers}</localWorkers>
|
</executions>
|
||||||
<!-- Uncomment the following to obtain details split-point reports
|
</plugin>
|
||||||
<compileReport>true</compileReport>
|
<plugin>
|
||||||
<detailedSoyc>true</detailedSoyc>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
-->
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
</configuration>
|
<version>1.9.1</version>
|
||||||
</execution>
|
<executions>
|
||||||
</executions>
|
<execution>
|
||||||
</plugin>
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>attach-artifact</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifacts>
|
||||||
|
<artifact>
|
||||||
|
<type>aar</type>
|
||||||
|
<file>${project.build.directory}/${project.build.finalName}.aar</file>
|
||||||
|
</artifact>
|
||||||
|
</artifacts>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
|
||||||
<extensions>
|
<plugins>
|
||||||
<!-- Enabling the use of FTP -->
|
<plugin>
|
||||||
<extension>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<groupId>org.apache.maven.wagon</groupId>
|
<artifactId>tycho-maven-plugin</artifactId>
|
||||||
<artifactId>wagon-ssh-external</artifactId>
|
<version>${tycho-version}</version>
|
||||||
<version>1.0-beta-6</version>
|
<extensions>true</extensions>
|
||||||
</extension>
|
</plugin>
|
||||||
</extensions>
|
<plugin>
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>target-platform-configuration</artifactId>
|
||||||
|
<version>${tycho-version}</version>
|
||||||
|
<configuration>
|
||||||
|
<resolver>p2</resolver>
|
||||||
|
<target>
|
||||||
|
<artifact>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>${project.artifactId}</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>../com.sap.sailing.targetplatform/definitions/${p2-target}</classifier>
|
||||||
|
</artifact>
|
||||||
|
</target>
|
||||||
|
<environments>
|
||||||
|
<environment>
|
||||||
|
<os>linux</os>
|
||||||
|
<ws>gtk</ws>
|
||||||
|
<arch>x86</arch>
|
||||||
|
</environment>
|
||||||
|
<environment>
|
||||||
|
<os>linux</os>
|
||||||
|
<ws>gtk</ws>
|
||||||
|
<arch>x86_64</arch>
|
||||||
|
</environment>
|
||||||
|
<environment>
|
||||||
|
<os>win32</os>
|
||||||
|
<ws>win32</ws>
|
||||||
|
<arch>x86</arch>
|
||||||
|
</environment>
|
||||||
|
<environment>
|
||||||
|
<os>win32</os>
|
||||||
|
<ws>win32</ws>
|
||||||
|
<arch>x86_64</arch>
|
||||||
|
</environment>
|
||||||
|
<environment>
|
||||||
|
<os>macosx</os>
|
||||||
|
<ws>cocoa</ws>
|
||||||
|
<arch>x86_64</arch>
|
||||||
|
</environment>
|
||||||
|
</environments>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>tycho-surefire-plugin</artifactId>
|
||||||
|
<version>${tycho-version}</version>
|
||||||
|
<configuration>
|
||||||
|
<argLine>${tycho.build.argLine}</argLine>
|
||||||
|
<excludes>
|
||||||
|
<!-- Exclude inner classes -->
|
||||||
|
<exclude>**/*$*</exclude>
|
||||||
|
</excludes>
|
||||||
|
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
|
<version>${tycho-version}</version>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<reporting>
|
<plugin>
|
||||||
<plugins>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<plugin>
|
<artifactId>gwt-maven-plugin</artifactId>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<version>${gwt.version}</version>
|
||||||
<artifactId>maven-surefire-report-plugin</artifactId>
|
<executions>
|
||||||
<version>2.16</version>
|
<!-- GWT version detected from dependencyManagement -->
|
||||||
<configuration>
|
<execution>
|
||||||
|
<configuration>
|
||||||
|
<extraJvmArgs>-Dgwt.persistentunitcache=false -Xmx2048m</extraJvmArgs>
|
||||||
|
<!--
|
||||||
|
<userAgents>chrome</userAgents>
|
||||||
|
-->
|
||||||
|
<!--
|
||||||
|
<style>PRETTY</style>
|
||||||
|
-->
|
||||||
|
<localWorkers>${gwt.workers}</localWorkers>
|
||||||
|
<!-- Uncomment the following to obtain details split-point reports
|
||||||
|
<compileReport>true</compileReport>
|
||||||
|
<detailedSoyc>true</detailedSoyc>
|
||||||
|
-->
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
</plugins>
|
||||||
|
|
||||||
|
<extensions>
|
||||||
|
<!-- Enabling the use of FTP -->
|
||||||
|
<extension>
|
||||||
|
<groupId>org.apache.maven.wagon</groupId>
|
||||||
|
<artifactId>wagon-ssh-external</artifactId>
|
||||||
|
<version>1.0-beta-6</version>
|
||||||
|
</extension>
|
||||||
|
</extensions>
|
||||||
|
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<reporting>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-report-plugin</artifactId>
|
||||||
|
<version>2.16</version>
|
||||||
|
<configuration>
|
||||||
|
<aggregate>true</aggregate>
|
||||||
|
<reportsDirectories>
|
||||||
|
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
||||||
<aggregate>true</aggregate>
|
<aggregate>true</aggregate>
|
||||||
<reportsDirectories>
|
</reportsDirectories>
|
||||||
<reportsDirectory>${reportsdirectory}</reportsDirectory>
|
</configuration>
|
||||||
<aggregate>true</aggregate>
|
</plugin>
|
||||||
</reportsDirectories>
|
</plugins>
|
||||||
</configuration>
|
</reporting>
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</reporting>
|
|
||||||
</project>
|
</project>
|
||||||
@@ -3,6 +3,6 @@
|
|||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="1.0">
|
android:versionName="1.0">
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -9,81 +9,87 @@
|
|||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>com.sap.sailing.android.shared</artifactId>
|
<artifactId>com.sap.sailing.android.shared</artifactId>
|
||||||
<packaging>apklib</packaging>
|
<packaging>aar</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.android.support</groupId>
|
||||||
<artifactId>org.json.simple</artifactId>
|
<artifactId>appcompat-v7</artifactId>
|
||||||
<version>1.1.0-SNAPSHOT</version>
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.domain.shared.android</artifactId>
|
<artifactId>com.sap.sse.security.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.shared.android</artifactId>
|
<artifactId>com.sap.sse.shared.android</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<artifactId>com.sap.sse.datamining.annotations</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<artifactId>com.sap.sailing.domain.common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<artifactId>com.sap.sailing.domain.shared.android</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.server.gateway.serialization.shared.android</artifactId>
|
<artifactId>com.sap.sailing.server.gateway.serialization.shared.android</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sse.common</artifactId>
|
<artifactId>com.sap.sse.common</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>com.sap.sailing.domain.common</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>org.json.simple</artifactId>
|
<artifactId>org.json.simple</artifactId>
|
||||||
<version>1.1.0-SNAPSHOT</version>
|
<version>1.1.0-SNAPSHOT</version>
|
||||||
|
<type>aar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.android.support</groupId>
|
|
||||||
<artifactId>support-v4</artifactId>
|
|
||||||
<version>21.0.3</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.android.support</groupId>
|
|
||||||
<artifactId>appcompat-v7</artifactId>
|
|
||||||
<version>21.0.3</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.android.gms</groupId>
|
<groupId>com.google.android.gms</groupId>
|
||||||
<artifactId>play-services</artifactId>
|
<artifactId>play-services-location</artifactId>
|
||||||
<version>6.5.87</version>
|
|
||||||
<type>aar</type>
|
<type>aar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>android</groupId>
|
<groupId>${android.api.groupId}</groupId>
|
||||||
<artifactId>android</artifactId>
|
<artifactId>android</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
@@ -93,13 +99,8 @@
|
|||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
<configuration>
|
|
||||||
<sdk>
|
|
||||||
<platform>21</platform>
|
|
||||||
</sdk>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="src" path="gen"/>
|
<classpathentry kind="src" path="gen"/>
|
||||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
<classpathentry kind="src" path="tests-jvm/src"/>
|
||||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.domain.common"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||||
<classpathentry kind="output" path="bin/classes"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.domain.common"/>
|
||||||
</classpath>
|
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
||||||
|
<classpathentry kind="output" path="bin/classes"/>
|
||||||
|
</classpath>
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
/gen
|
bin/
|
||||||
/bin
|
target/
|
||||||
/target
|
gen/
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
|
||||||
Whitespace-only changes.
@@ -1,123 +1,174 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<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/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>mobile</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
<parent>
|
||||||
<artifactId>com.sap.sailing.android.tracking.app</artifactId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<packaging>apk</packaging>
|
<artifactId>mobile</artifactId>
|
||||||
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<!-- If you change this name, change in app too! -->
|
<artifactId>com.sap.sailing.android.tracking.app</artifactId>
|
||||||
<additional-deployment-version-file>com.sap.sailing.android.tracking.app.version</additional-deployment-version-file>
|
<packaging>apk</packaging>
|
||||||
<!-- passed by buildAndUpdateProduct.sh (parsed from AndroidManifest.xml) -->
|
|
||||||
<app-version>${tracking-app-version}</app-version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
<properties>
|
||||||
<dependency>
|
<!-- If you change this name, change in app too! -->
|
||||||
<groupId>android</groupId>
|
<additional-deployment-version-file>com.sap.sailing.android.tracking.app.version</additional-deployment-version-file>
|
||||||
<artifactId>android</artifactId>
|
<!-- passed by buildAndUpdateProduct.sh (parsed from AndroidManifest.xml) -->
|
||||||
</dependency>
|
<app-version>${tracking-app-version}</app-version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<!--
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.android.support</groupId>
|
<groupId>${android.api.groupId}</groupId>
|
||||||
<artifactId>support-annotations</artifactId>
|
<artifactId>android</artifactId>
|
||||||
<version>21.0.3</version>
|
</dependency>
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.android.support</groupId>
|
<groupId>com.google.android.gms</groupId>
|
||||||
<artifactId>support-v4</artifactId>
|
<artifactId>play-services-gcm</artifactId>
|
||||||
<version>21.0.3</version>
|
<type>aar</type>
|
||||||
<type>aar</type>
|
</dependency>
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.android.support</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>appcompat-v7</artifactId>
|
<artifactId>com.sap.sailing.android.shared</artifactId>
|
||||||
<version>21.0.3</version>
|
<version>${project.version}</version>
|
||||||
<type>aar</type>
|
<type>aar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.android.gms</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>play-services</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<version>6.5.87</version>
|
<version>4.8.2</version>
|
||||||
<type>aar</type>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-core</artifactId>
|
||||||
|
<version>1.10.16</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
</dependencies>
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>com.sap.sailing.android.shared</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
<type>apklib</type>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<sourceDirectory>src</sourceDirectory>
|
<sourceDirectory>src</sourceDirectory>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>alignApk</id>
|
||||||
|
<phase>install</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>zipalign</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>add-test-source</id>
|
||||||
|
<phase>generate-test-sources</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>add-test-source</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<sources>
|
||||||
|
<source>${project.basedir}/tests-jvm/src</source>
|
||||||
|
</sources>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>non-leandi</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<!-- If not running on Lean DI we do the signing by ourselves with our own keystore. -->
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<configuration>
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
|
||||||
<extractDuplicates>true</extractDuplicates>
|
|
||||||
<sdk>
|
|
||||||
<platform>21</platform>
|
|
||||||
</sdk>
|
|
||||||
<release>true</release>
|
|
||||||
<proguard>
|
|
||||||
<!-- Someone needs to look into this - quite hard to find a configuration that doesnt break everything -->
|
|
||||||
<skip>true</skip>
|
|
||||||
<config>proguard-project.txt</config>
|
|
||||||
<configs>
|
|
||||||
<config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
|
|
||||||
</configs>
|
|
||||||
</proguard>
|
|
||||||
<zipalign>
|
|
||||||
<skip>false</skip>
|
|
||||||
</zipalign>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>apk</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<excludeJarResources>
|
|
||||||
<!-- Prevents *-sources.jar to be distributed with the APK -->
|
|
||||||
<excludeJarResource>^com\.sap\..*.jar$</excludeJarResource>
|
|
||||||
</excludeJarResources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- plugins for generating version file and copying .apk -->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed for copying the *.apk to com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed for creation of *.version files for the *.apk in com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed to clean the app in com.sap.sailing.www project. -->
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-no-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI but it's not a release build, we do signing on our own. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>milestone</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI and it's a release build, we do SAP signing. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>customer</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.sap.prd.codesign</groupId>
|
||||||
|
<artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<!-- <plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin> -->
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -2,8 +2,10 @@
|
|||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="src" path="gen"/>
|
<classpathentry kind="src" path="gen"/>
|
||||||
|
<classpathentry kind="src" path="tests-jvm/src"/>
|
||||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
||||||
<classpathentry kind="output" path="bin/classes"/>
|
<classpathentry kind="output" path="bin/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
|
||||||
Whitespace-only changes.
@@ -1,124 +1,167 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<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/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>mobile</artifactId>
|
<artifactId>mobile</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>com.sap.sailing.android.buoy.positioning.app</artifactId>
|
<artifactId>com.sap.sailing.android.buoy.positioning.app</artifactId>
|
||||||
<packaging>apk</packaging>
|
<packaging>apk</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- If you change this name, change in app too! -->
|
<!-- If you change this name, change in app too! -->
|
||||||
<additional-deployment-version-file>com.sap.sailing.android.buoy.positioning.app.version
|
<additional-deployment-version-file>com.sap.sailing.android.buoy.positioning.app.version
|
||||||
</additional-deployment-version-file>
|
</additional-deployment-version-file>
|
||||||
<!-- passed by buildAndUpdateProduct.sh (parsed from AndroidManifest.xml) -->
|
<!-- passed by buildAndUpdateProduct.sh (parsed from AndroidManifest.xml) -->
|
||||||
<app-version>${buoy.positioning-app-version}</app-version>
|
<app-version>${buoy.positioning-app-version}</app-version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>android</groupId>
|
<groupId>${android.api.groupId}</groupId>
|
||||||
<artifactId>android</artifactId>
|
<artifactId>android</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
<dependency>
|
||||||
<dependency>
|
<groupId>${project.groupId}</groupId>
|
||||||
<groupId>com.android.support</groupId>
|
<artifactId>com.sap.sailing.android.shared</artifactId>
|
||||||
<artifactId>support-annotations</artifactId>
|
<version>${project.version}</version>
|
||||||
<version>21.0.3</version>
|
<type>aar</type>
|
||||||
<type>aar</type>
|
</dependency>
|
||||||
</dependency>
|
<dependency>
|
||||||
-->
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.8.2</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-core</artifactId>
|
||||||
|
<version>1.10.16</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
</dependencies>
|
||||||
<groupId>com.android.support</groupId>
|
<build>
|
||||||
<artifactId>support-v4</artifactId>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<version>21.0.3</version>
|
<sourceDirectory>src</sourceDirectory>
|
||||||
<type>aar</type>
|
<plugins>
|
||||||
</dependency>
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>alignApk</id>
|
||||||
|
<phase>install</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>zipalign</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>add-test-source</id>
|
||||||
|
<phase>generate-test-sources</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>add-test-source</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<sources>
|
||||||
|
<source>${project.basedir}/tests-jvm/src</source>
|
||||||
|
</sources>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
<dependency>
|
<profiles>
|
||||||
<groupId>com.android.support</groupId>
|
<profile>
|
||||||
<artifactId>appcompat-v7</artifactId>
|
<id>non-leandi</id>
|
||||||
<version>22.2.0</version>
|
<activation>
|
||||||
<type>aar</type>
|
<property>
|
||||||
</dependency>
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
<dependency>
|
</activation>
|
||||||
<groupId>com.google.android.gms</groupId>
|
<build>
|
||||||
<artifactId>play-services</artifactId>
|
<plugins>
|
||||||
<version>7.5.0</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sap.sailing</groupId>
|
|
||||||
<artifactId>com.sap.sailing.android.shared</artifactId>
|
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
|
||||||
<type>apklib</type>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<sourceDirectory>src</sourceDirectory>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<!-- If not running on Lean DI we do the signing by ourselves with our own keystore. -->
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<configuration>
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
|
||||||
<extractDuplicates>true</extractDuplicates>
|
|
||||||
<sdk>
|
|
||||||
<platform>21</platform>
|
|
||||||
</sdk>
|
|
||||||
<release>true</release>
|
|
||||||
<proguard>
|
|
||||||
<!-- Someone needs to look into this - quite hard to find a configuration that doesnt break everything -->
|
|
||||||
<skip>true</skip>
|
|
||||||
<config>proguard-project.txt</config>
|
|
||||||
<configs>
|
|
||||||
<config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
|
|
||||||
</configs>
|
|
||||||
</proguard>
|
|
||||||
<zipalign>
|
|
||||||
<skip>false</skip>
|
|
||||||
</zipalign>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>apk</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<excludeJarResources>
|
|
||||||
<!-- Prevents *-sources.jar to be distributed with the APK -->
|
|
||||||
<excludeJarResource>^com\.sap\..*.jar$</excludeJarResource>
|
|
||||||
</excludeJarResources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- plugins for generating version file and copying .apk -->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed for copying the *.apk to com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed for creation of *.version files for the *.apk in com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed to clean the app in com.sap.sailing.www project. -->
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-no-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI but it's not a release build, we do signing on our own. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>milestone</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI and it's a release build, we do SAP signing. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>customer</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.sap.prd.codesign</groupId>
|
||||||
|
<artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<!-- <plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin> -->
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
@@ -11,6 +11,6 @@
|
|||||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-21
|
target=android-22
|
||||||
android.library.reference.1=../google-play-services_lib
|
android.library.reference.1=../google-play-services_lib
|
||||||
android.library.reference.2=../com.sap.sailing.android.shared
|
android.library.reference.2=../com.sap.sailing.android.shared
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
/gen
|
bin/
|
||||||
/bin
|
target/
|
||||||
/target
|
gen/
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
|
||||||
Whitespace-only changes.
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<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/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<artifactId>mobile</artifactId>
|
<artifactId>mobile</artifactId>
|
||||||
@@ -21,61 +21,52 @@
|
|||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- needed on remote repository -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>android</groupId>
|
<groupId>${android.api.groupId}</groupId>
|
||||||
<artifactId>android</artifactId>
|
<artifactId>android</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.android.support</groupId>
|
<groupId>com.h6ah4i.android.widget.advrecyclerview</groupId>
|
||||||
<artifactId>support-annotations</artifactId>
|
<artifactId>advrecyclerview</artifactId>
|
||||||
<version>21.0.3</version>
|
<version>0.6.2</version>
|
||||||
<type>aar</type>
|
<type>aar</type>
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.android.support</groupId>
|
|
||||||
<artifactId>support-v4</artifactId>
|
|
||||||
<version>21.0.3</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.android.support</groupId>
|
|
||||||
<artifactId>appcompat-v7</artifactId>
|
|
||||||
<version>21.0.3</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.android.gms</groupId>
|
|
||||||
<artifactId>play-services</artifactId>
|
|
||||||
<version>6.5.87</version>
|
|
||||||
<type>aar</type>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- needed on remote repository -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mobeta.android.dslv</groupId>
|
|
||||||
<artifactId>drag-sort-listview</artifactId>
|
|
||||||
<version>0.6.1-SNAPSHOT</version>
|
|
||||||
<type>apklib</type>
|
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>com.google.android</groupId>
|
<groupId>com.android.support</groupId>
|
||||||
<artifactId>support-v4</artifactId>
|
<artifactId>recyclerview-v7</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.android.support</groupId>
|
||||||
|
<artifactId>appcompat-v7</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.android.support</groupId>
|
||||||
<artifactId>com.sap.sailing.android.shared</artifactId>
|
<artifactId>recyclerview-v7</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<type>aar</type>
|
||||||
<type>apklib</type>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>com.sap.sailing.android.shared</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.8.2</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-core</artifactId>
|
||||||
|
<version>1.10.16</version>
|
||||||
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
@@ -84,54 +75,116 @@
|
|||||||
<sourceDirectory>src</sourceDirectory>
|
<sourceDirectory>src</sourceDirectory>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
<configuration>
|
|
||||||
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
|
||||||
<extractDuplicates>true</extractDuplicates>
|
|
||||||
<sdk>
|
|
||||||
<platform>21</platform>
|
|
||||||
</sdk>
|
|
||||||
<release>true</release>
|
|
||||||
<proguard>
|
|
||||||
<!-- Someone needs to look into this - quite hard to find a configuration that doesnt break everything -->
|
|
||||||
<skip>true</skip>
|
|
||||||
<config>proguard-project.txt</config>
|
|
||||||
<configs>
|
|
||||||
<config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
|
|
||||||
</configs>
|
|
||||||
</proguard>
|
|
||||||
<zipalign>
|
|
||||||
<skip>false</skip>
|
|
||||||
</zipalign>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
<id>alignApk</id>
|
||||||
|
<phase>install</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>apk</goal>
|
<goal>zipalign</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>add-test-source</id>
|
||||||
|
<phase>generate-test-sources</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>add-test-source</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<excludeJarResources>
|
<sources>
|
||||||
<!-- Prevents *-sources.jar to be distributed with the APK -->
|
<source>${project.basedir}/tests-jvm/src</source>
|
||||||
<excludeJarResource>^com\.sap\..*.jar$</excludeJarResource>
|
</sources>
|
||||||
</excludeJarResources>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
</plugins>
|
||||||
<!-- plugins for generating version file and copying .apk -->
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>non-leandi</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- If not running on Lean DI we do the signing by ourselves with our own keystore. -->
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<!-- Needed for copying the *.apk to com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed for creation of *.version files for the *.apk in com.sap.sailing.www project. -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<!-- Needed to clean the app in com.sap.sailing.www project. -->
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-no-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI but it's not a release build, we do signing on our own. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>milestone</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<!-- When running on Lean DI and it's a release build, we do SAP signing. -->
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>customer</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.sap.prd.codesign</groupId>
|
||||||
|
<artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<!-- <plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
</plugin> -->
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
+515
-132
@@ -1,145 +1,528 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<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/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>workspace</artifactId>
|
<artifactId>workspace</artifactId>
|
||||||
<groupId>com.sap.sailing</groupId>
|
<groupId>com.sap.sailing</groupId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>mobile</artifactId>
|
<artifactId>mobile</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<!--
|
<module>com.sap.sailing.android.shared</module>
|
||||||
<module>com.sap.sailing.racecommittee.app</module>
|
<module>com.sap.sailing.racecommittee.app</module>
|
||||||
<module>com.sap.sailing.android.shared</module>
|
<module>com.sap.sailing.android.tracking.app</module>
|
||||||
<module>com.sap.sailing.adnroid.buoy.positioning.app</module>
|
<module>com.sap.sailing.buoy.positioning</module>
|
||||||
<module>com.sap.sailing.android.tracking.app</module>
|
</modules>
|
||||||
-->
|
|
||||||
</modules>
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- used to copy android apps to the static web dir (auto-update functionality) -->
|
<!-- used to copy android apps to the static web dir (auto-update functionality) -->
|
||||||
<!-- relative dir as seen from the child modules -->
|
<!-- relative dir as seen from the child modules -->
|
||||||
<additional-deployment-dir>../../java/com.sap.sailing.www/apps</additional-deployment-dir>
|
<additional-deployment-dir>../../java/com.sap.sailing.www/apps</additional-deployment-dir>
|
||||||
<!-- redefine in child poms -->
|
<!-- redefine in child poms -->
|
||||||
<additional-deployment-version-file></additional-deployment-version-file>
|
<additional-deployment-version-file></additional-deployment-version-file>
|
||||||
<app-version></app-version>
|
<app-version></app-version>
|
||||||
</properties>
|
<android.support.version>22.1.1</android.support.version>
|
||||||
|
<play.services.version>7.5.0</play.services.version>
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<!-- needed on remote repository -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>android</groupId>
|
|
||||||
<artifactId>android</artifactId>
|
|
||||||
<version>4.4.2_r4</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- needed on remote repository -->
|
<sign.keystore>../android-keystore/STG-debug.jks</sign.keystore>
|
||||||
<dependency>
|
<sign.alias>stg_debug</sign.alias>
|
||||||
<groupId>android.support</groupId>
|
<sign.storepass>stg_debug</sign.storepass>
|
||||||
<artifactId>compatibility-v4</artifactId>
|
<sign.keypass>stg_debug</sign.keypass>
|
||||||
<version>19</version>
|
</properties>
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<build>
|
<dependencyManagement>
|
||||||
<pluginManagement>
|
<dependencies>
|
||||||
<plugins>
|
<dependency>
|
||||||
<plugin>
|
<groupId>${android.api.groupId}</groupId>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<artifactId>android</artifactId>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<version>${android.api.version}</version>
|
||||||
<version>3.9.0-rc.1</version>
|
<scope>provided</scope>
|
||||||
<configuration>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.android.support</groupId>
|
||||||
|
<artifactId>appcompat-v7</artifactId>
|
||||||
|
<version>${android.support.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.android.support</groupId>
|
||||||
|
<artifactId>support-v4</artifactId>
|
||||||
|
<version>${android.support.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.android.support</groupId>
|
||||||
|
<artifactId>recyclerview-v7</artifactId>
|
||||||
|
<version>${android.support.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.android.gms</groupId>
|
||||||
|
<artifactId>play-services-location</artifactId>
|
||||||
|
<version>${play.services.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.android.gms</groupId>
|
||||||
|
<artifactId>play-services-gcm</artifactId>
|
||||||
|
<version>${play.services.version}</version>
|
||||||
|
<type>aar</type>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</dependencyManagement>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>${project.basedir}/assets</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<targetPath>${project.build.directory}/filteredassets</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>build.info</include>
|
||||||
|
</includes>
|
||||||
|
</resource>
|
||||||
|
<resource>
|
||||||
|
<directory>${project.basedir}/assets</directory>
|
||||||
|
<filtering>false</filtering>
|
||||||
|
<targetPath>${project.build.directory}/filteredassets</targetPath>
|
||||||
|
<excludes>
|
||||||
|
<exclude>build.info</exclude>
|
||||||
|
</excludes>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>pl.project13.maven</groupId>
|
||||||
|
<artifactId>git-commit-id-plugin</artifactId>
|
||||||
|
<version>2.2.0</version>
|
||||||
|
<configuration>
|
||||||
|
<verbose>true</verbose>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>revision</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>initialize</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>resources</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<resourceDirectory>res</resourceDirectory>
|
||||||
|
<assetsDirectory>${project.build.directory}/filteredassets</assetsDirectory>
|
||||||
|
<sourceDirectories>
|
||||||
|
<sourceDirectory>${project.basedir}/src</sourceDirectory>
|
||||||
|
</sourceDirectories>
|
||||||
|
<failOnDuplicatePackages>false</failOnDuplicatePackages>
|
||||||
|
<failOnNonStandardStructure>false</failOnNonStandardStructure>
|
||||||
|
<failOnConflictingLayouts>false</failOnConflictingLayouts>
|
||||||
|
<failOnDuplicatePackages>false</failOnDuplicatePackages>
|
||||||
|
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
||||||
|
<extractDuplicates>true</extractDuplicates>
|
||||||
|
<release>false</release>
|
||||||
|
<outputApk>${project.build.directory}/${project.build.finalName}-unaligned.apk</outputApk>
|
||||||
|
<proguard>
|
||||||
|
<!-- Someone needs to look into this - quite hard to find a configuration that doesnt break everything -->
|
||||||
|
<skip>true</skip>
|
||||||
|
<configs>
|
||||||
|
<config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
|
||||||
|
<config>${project.basedir}/proguard-project.txt</config>
|
||||||
|
<config>${project.basedir}/../proguard-mobile.txt</config>
|
||||||
|
</configs>
|
||||||
|
</proguard>
|
||||||
|
<zipalign>
|
||||||
|
<skip>false</skip>
|
||||||
|
<inputApk>${project.build.directory}/${project.build.finalName}-unaligned.apk</inputApk>
|
||||||
|
<outputApk>${project.build.directory}/${project.build.finalName}.apk</outputApk>
|
||||||
|
</zipalign>
|
||||||
|
<excludeJarResources>
|
||||||
|
<!-- Prevents *-sources.jar to be distributed with the APK -->
|
||||||
|
<excludeJarResource>^.*-sources.jar$</excludeJarResource>
|
||||||
|
<excludeJarResource>^android.*.jar$</excludeJarResource>
|
||||||
|
</excludeJarResources>
|
||||||
|
<dex>
|
||||||
|
<jvmArguments>
|
||||||
|
<jvmArgument>-Xms1024m</jvmArgument>
|
||||||
|
<jvmArgument>-Xmx2048m</jvmArgument>
|
||||||
|
</jvmArguments>
|
||||||
|
</dex>
|
||||||
|
<classesJarExcludes>
|
||||||
|
<classesJarExclude>*.jar</classesJarExclude>
|
||||||
|
<classesJarExclude>generated-sources/**</classesJarExclude>
|
||||||
|
<classesJarExclude>maven-archiver/**</classesJarExclude>
|
||||||
|
<classesJarExclude>sourcebundle-l10n-gen/**</classesJarExclude>
|
||||||
|
<classesJarExclude>p2*</classesJarExclude>
|
||||||
|
<classesJarExclude>MANIFEST.MF</classesJarExclude>
|
||||||
|
<classesJarExclude>*.ap_</classesJarExclude>
|
||||||
|
<classesJarExclude>local-artifacts.properties</classesJarExclude>
|
||||||
|
<classesJarExclude>android/**</classesJarExclude>
|
||||||
|
<classesJarExclude>com/google/**</classesJarExclude>
|
||||||
|
<classesJarExclude>**/R.class</classesJarExclude>
|
||||||
|
<classesJarExclude>**/R$*.class</classesJarExclude>
|
||||||
|
</classesJarExcludes>
|
||||||
<sdk>
|
<sdk>
|
||||||
<platform>19</platform>
|
<platform>22</platform>
|
||||||
</sdk>
|
</sdk>
|
||||||
</configuration>
|
<sign>
|
||||||
<extensions>true</extensions>
|
<debug>false</debug>
|
||||||
</plugin>
|
</sign>
|
||||||
<plugin>
|
</configuration>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<executions>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<execution>
|
||||||
<version>2.8</version>
|
<id>alignApk</id>
|
||||||
<executions>
|
<phase>pre-integration-test</phase>
|
||||||
<execution>
|
<goals>
|
||||||
<id>copy-installed</id>
|
<goal>zipalign</goal>
|
||||||
<phase>install</phase>
|
</goals>
|
||||||
<goals>
|
</execution>
|
||||||
<goal>copy</goal>
|
</executions>
|
||||||
</goals>
|
</plugin>
|
||||||
<configuration>
|
<plugin>
|
||||||
<artifactItems>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactItem>
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
<groupId>${project.groupId}</groupId>
|
<version>1.4</version>
|
||||||
<artifactId>${project.artifactId}</artifactId>
|
<executions>
|
||||||
<version>${project.version}</version>
|
<execution>
|
||||||
<type>${project.packaging}</type>
|
<id>signing</id>
|
||||||
</artifactItem>
|
<goals>
|
||||||
</artifactItems>
|
<goal>sign</goal>
|
||||||
<outputDirectory>${additional-deployment-dir}</outputDirectory>
|
<goal>verify</goal>
|
||||||
<stripVersion>true</stripVersion>
|
</goals>
|
||||||
</configuration>
|
<phase>package</phase>
|
||||||
</execution>
|
<inherited>true</inherited>
|
||||||
</executions>
|
<configuration>
|
||||||
</plugin>
|
<removeExistingSignatures>true</removeExistingSignatures>
|
||||||
<plugin>
|
<archive>${project.build.directory}/${project.build.finalName}-unaligned.apk</archive>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<keystore>${sign.keystore}</keystore>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<alias>${sign.alias}</alias>
|
||||||
<version>1.3</version>
|
<storepass>${sign.storepass}</storepass>
|
||||||
<executions>
|
<keypass>${sign.keypass}</keypass>
|
||||||
<execution>
|
<verbose>true</verbose>
|
||||||
<id>generate-version</id>
|
<arguments>
|
||||||
<phase>install</phase>
|
<argument>-sigalg</argument><argument>MD5withRSA</argument>
|
||||||
<goals>
|
<argument>-digestalg</argument><argument>SHA1</argument>
|
||||||
<goal>run</goal>
|
</arguments>
|
||||||
</goals>
|
</configuration>
|
||||||
<configuration>
|
</execution>
|
||||||
<tasks>
|
</executions>
|
||||||
<property name="target.dir" value="${additional-deployment-dir}" />
|
</plugin>
|
||||||
<property name="target.name" value="${additional-deployment-version-file}" />
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<source>1.7</source>
|
||||||
|
<target>1.7</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<version>1.9.1</version>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
<version>2.7</version>
|
||||||
|
<configuration>
|
||||||
|
<nonFilteredFileExtensions>
|
||||||
|
<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
|
||||||
|
<nonFilteredFileExtension>pdf</nonFilteredFileExtension>
|
||||||
|
</nonFilteredFileExtensions>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
<echo file="${target.dir}/${target.name}" message="${project.build.finalName}.apk=${app-version}" />
|
<plugin>
|
||||||
<echo message="Version file generated in ${target.dir}/${target.name}." />
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
</tasks>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
</configuration>
|
<version>1.3</version>
|
||||||
</execution>
|
</plugin>
|
||||||
</executions>
|
</plugins>
|
||||||
</plugin>
|
</pluginManagement>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
|
||||||
<version>2.5</version>
|
|
||||||
<configuration>
|
|
||||||
<filesets>
|
|
||||||
<fileset>
|
|
||||||
<directory>${additional-deployment-dir}</directory>
|
|
||||||
<includes>
|
|
||||||
<include>${project.build.finalName}.apk</include>
|
|
||||||
<include>${additional-deployment-version-file}</include>
|
|
||||||
</includes>
|
|
||||||
<excludes>
|
|
||||||
<exclude>*.gitignore</exclude>
|
|
||||||
</excludes>
|
|
||||||
<followSymlinks>false</followSymlinks>
|
|
||||||
</fileset>
|
|
||||||
</filesets>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<source>1.7</source>
|
|
||||||
<target>1.7</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
</build>
|
</build>
|
||||||
</project>
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<!-- activate with parameter '-P non-leandi-release'-->
|
||||||
|
<id>non-leandi-release</id>
|
||||||
|
<activation>
|
||||||
|
<activeByDefault>false</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<sign.keystore>../android-keystore/STG.jks</sign.keystore>
|
||||||
|
<sign.alias></sign.alias>
|
||||||
|
<sign.storepass></sign.storepass>
|
||||||
|
<sign.keypass></sign.keypass>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<release>true</release>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi-release</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
<value>true</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<release>true</release>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<!-- This dependency simply ensures, that the Android SDK installation is completed on Lean DI before anything else is being built. -->
|
||||||
|
<groupId>com.sap.sailing</groupId>
|
||||||
|
<artifactId>install-android-sdk</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<type>pom</type>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>non-leandi</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<version>2.8</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>copy-installed</id>
|
||||||
|
<phase>install</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>copy</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifactItems>
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>${project.artifactId}</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>${project.packaging}</type>
|
||||||
|
</artifactItem>
|
||||||
|
</artifactItems>
|
||||||
|
<outputDirectory>${additional-deployment-dir}</outputDirectory>
|
||||||
|
<stripVersion>true</stripVersion>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>generate-version</id>
|
||||||
|
<phase>install</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<tasks>
|
||||||
|
<property name="target.dir" value="${additional-deployment-dir}" />
|
||||||
|
<property name="target.name" value="${additional-deployment-version-file}" />
|
||||||
|
|
||||||
|
<echo file="${target.dir}/${target.name}" message="${project.build.finalName}.apk=${app-version}" />
|
||||||
|
<echo message="Version file generated in ${target.dir}/${target.name}." />
|
||||||
|
</tasks>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<version>2.5</version>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${additional-deployment-dir}</directory>
|
||||||
|
<includes>
|
||||||
|
<include>${project.build.finalName}.apk</include>
|
||||||
|
<include>${additional-deployment-version-file}</include>
|
||||||
|
</includes>
|
||||||
|
<excludes>
|
||||||
|
<exclude>*.gitignore</exclude>
|
||||||
|
</excludes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<!-- This turns SAP specific signing on. -->
|
||||||
|
<id>leandi-realsign</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseType</name>
|
||||||
|
<value>customer</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.sap.prd.codesign</groupId>
|
||||||
|
<artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
|
||||||
|
|
||||||
|
<configuration>
|
||||||
|
<signingTech>ANDROID</signingTech>
|
||||||
|
<archiveDirectory>${project.build.directory}</archiveDirectory>
|
||||||
|
<processMainArtifact>false</processMainArtifact>
|
||||||
|
<processAttachedArtifacts>false</processAttachedArtifacts>
|
||||||
|
<removeExistingSignatures>true</removeExistingSignatures>
|
||||||
|
<includes>
|
||||||
|
<include>${project.build.finalName}-unaligned.apk</include>
|
||||||
|
</includes>
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
<executions>
|
||||||
|
|
||||||
|
<execution>
|
||||||
|
<id>sign</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>sign</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
|
||||||
|
</executions>
|
||||||
|
|
||||||
|
</plugin>
|
||||||
|
<!--
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
|
||||||
|
<execution>
|
||||||
|
<id>zip-apk</id>
|
||||||
|
<phase>integration-test</phase>
|
||||||
|
|
||||||
|
<configuration>
|
||||||
|
<tasks>
|
||||||
|
<zip
|
||||||
|
file="${project.build.directory}/${project.build.finalName}.zip">
|
||||||
|
<fileset dir="${project.build.directory}"
|
||||||
|
includes="${project.artifactId}.apk" />
|
||||||
|
</zip>
|
||||||
|
</tasks>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<version>1.5</version>
|
||||||
|
<executions>
|
||||||
|
|
||||||
|
<execution>
|
||||||
|
<id>attach-artifacts</id>
|
||||||
|
<phase>integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>attach-artifact</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifacts>
|
||||||
|
|
||||||
|
<artifact>
|
||||||
|
<file>${project.build.directory}/${project.artifactId}.zip
|
||||||
|
</file>
|
||||||
|
<type>zip </type>
|
||||||
|
<classifier>smp</classifier>
|
||||||
|
</artifact>
|
||||||
|
|
||||||
|
TODO implement
|
||||||
|
<artifact>
|
||||||
|
<file>${project.build.directory}/AndroidMarketMetadata.zip
|
||||||
|
</file>
|
||||||
|
<type>zip </type>
|
||||||
|
<classifier>AndroidMetadata</classifier>
|
||||||
|
</artifact>
|
||||||
|
|
||||||
|
</artifacts>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
|
||||||
|
|
||||||
|
</executions>
|
||||||
|
</plugin> -->
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
||||||
@@ -15,10 +15,14 @@
|
|||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<!-- deactivate with parameter '-P !with-mobile'-->
|
|
||||||
<id>with-mobile</id>
|
<id>with-mobile</id>
|
||||||
<activation>
|
<activation>
|
||||||
<activeByDefault>true</activeByDefault>
|
<!-- This profile is active by default, when running on a Lean DI environment.
|
||||||
|
On Lean DI, the only things we want to build are the Android apps and everything that's needed for it.
|
||||||
|
In a non Lean DI build, you can activate this profile with the parameter "-P with-mobile". -->
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<modules>
|
<modules>
|
||||||
<module>mobile</module>
|
<module>mobile</module>
|
||||||
@@ -31,38 +35,144 @@
|
|||||||
<module>ios</module>
|
<module>ios</module>
|
||||||
</modules>
|
</modules>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>leandi</id>
|
||||||
|
<activation>
|
||||||
|
<!-- This profile is active by default, when running on a Lean DI environment.
|
||||||
|
The definitions in this profile aren't valid when running locally or on hudson.sapsailing.com. -->
|
||||||
|
<property>
|
||||||
|
<name>ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<modules>
|
||||||
|
<!-- The submodule "install-android-sdk" ensures that the Android SDK is being assembled by unzipping severall *.zip files on Lean DI. -->
|
||||||
|
<module>install-android-sdk</module>
|
||||||
|
</modules>
|
||||||
|
<properties>
|
||||||
|
<!-- By default, the Android API *.jar is hosted in MAven repositories under "android:android".
|
||||||
|
On Lean DI, the deviant coordinates "com.google.download.android:android".
|
||||||
|
To make this work without the need of a duplicate definition of the dependencies by profile,
|
||||||
|
the groupId of this artifact is defined by a property so that we can easily change it for Lean DI. -->
|
||||||
|
<android.api.groupId>com.google.download.android</android.api.groupId>
|
||||||
|
<!-- By default, the Android API we use is "5.1.1_r2". On Lean DI this version is uploaded to nexus with a different version.
|
||||||
|
To make this work without the need of a duplicate definition of the dependencies by profile,
|
||||||
|
the version of this artifact is defined by a property so that we can easily change it for Lean DI. -->
|
||||||
|
<android.api.version>5.1.1</android.api.version>
|
||||||
|
</properties>
|
||||||
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<sdk>
|
||||||
|
<!-- On Lean DI ther is no environment variable "ANDROID_HOME" that by default points to the location where the Android SDK is hosted.
|
||||||
|
That's why we need to explicitly define the location of the SDK. -->
|
||||||
|
<path>${ldi.android.sdk.location}</path>
|
||||||
|
</sdk>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>non-leandi</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>!ldi.releaseBuild</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<!-- The repository declarations are only active when running ion a non Lean DI environment.
|
||||||
|
On Lean DI we are not allowed to define our own repositories because everything must be hosted in SAP's Nexus server. -->
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>equinox-sdk-3.9</id>
|
||||||
|
<layout>p2</layout>
|
||||||
|
<url>http://download.eclipse.org/releases/luna/</url>
|
||||||
|
</repository>
|
||||||
|
<!--
|
||||||
|
<repository>
|
||||||
|
<id>sap-nexus</id>
|
||||||
|
<url>http://nexus.wdf.sap.corp:8081/nexus/content/groups/build.snapshots</url>
|
||||||
|
</repository>
|
||||||
|
-->
|
||||||
|
<repository>
|
||||||
|
<id>sailing-server-maven</id>
|
||||||
|
<url>http://maven.sapsailing.com/maven</url>
|
||||||
|
</repository>
|
||||||
|
|
||||||
|
<repository>
|
||||||
|
<id>central</id>
|
||||||
|
<url>http://repo1.maven.org/maven2</url>
|
||||||
|
</repository>
|
||||||
|
|
||||||
|
<repository>
|
||||||
|
<id>uni-luebeck</id>
|
||||||
|
<url>http://www.itm.uni-luebeck.de/projects/maven/releases</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
|
||||||
|
<!-- Lean DI specific properties that are needed to assemble the Android SDK. -->
|
||||||
|
<ldi.download.android.sdk.version>24.4</ldi.download.android.sdk.version>
|
||||||
|
<ldi.download.android.tools.version>21.1</ldi.download.android.tools.version>
|
||||||
|
<ldi.download.android.platform-tools.version>23.0.1</ldi.download.android.platform-tools.version>
|
||||||
|
<ldi.download.android.build-tools.version>22.0.1</ldi.download.android.build-tools.version>
|
||||||
|
<ldi.android.build-tools.version>5.1</ldi.android.build-tools.version>
|
||||||
|
<ldi.download.android.platform.version>22_r02</ldi.download.android.platform.version>
|
||||||
|
|
||||||
|
<!-- WORKSPACE is an env set by Jenkins pointing to the build job's work directory.-->
|
||||||
|
<ldi.android.sdk.parent.location>${env.WORKSPACE}</ldi.android.sdk.parent.location>
|
||||||
|
<ldi.android.sdk.location>${ldi.android.sdk.parent.location}/android-sdk-windows</ldi.android.sdk.location>
|
||||||
|
|
||||||
|
<android.platform.version>22</android.platform.version>
|
||||||
|
<android.api.groupId>android</android.api.groupId>
|
||||||
|
<android.api.version>5.1.1_r2</android.api.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<repositories>
|
<build>
|
||||||
<repository>
|
<plugins>
|
||||||
<id>equinox-sdk-3.9</id>
|
<plugin>
|
||||||
<layout>p2</layout>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<url>http://download.eclipse.org/releases/luna/</url>
|
<artifactId>maven-help-plugin</artifactId>
|
||||||
</repository>
|
<version>2.2</version>
|
||||||
<!--
|
<executions>
|
||||||
<repository>
|
<execution>
|
||||||
<id>sap-nexus</id>
|
<id>activeProfiles</id>
|
||||||
<url>http://nexus.wdf.sap.corp:8081/nexus/content/groups/build.snapshots</url>
|
<phase>initialize</phase>
|
||||||
</repository>
|
<goals>
|
||||||
-->
|
<goal>active-profiles</goal>
|
||||||
<repository>
|
</goals>
|
||||||
<id>sailing-server-maven</id>
|
</execution>
|
||||||
<url>http://maven.sapsailing.com/maven</url>
|
</executions>
|
||||||
</repository>
|
</plugin>
|
||||||
|
</plugins>
|
||||||
<repository>
|
<pluginManagement>
|
||||||
<id>central</id>
|
<plugins>
|
||||||
<url>http://repo1.maven.org/maven2</url>
|
|
||||||
</repository>
|
<plugin>
|
||||||
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
<repository>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
<id>uni-luebeck</id>
|
<version>4.3.0</version>
|
||||||
<url>http://www.itm.uni-luebeck.de/projects/maven/releases</url>
|
<extensions>true</extensions>
|
||||||
</repository>
|
<configuration>
|
||||||
</repositories>
|
<androidManifestFile>AndroidManifest.xml</androidManifestFile>
|
||||||
|
<destinationManifestFile>${project.build.directory}/AndroidManifest.xml</destinationManifestFile>
|
||||||
|
<sdk>
|
||||||
|
<platform>${android.platform}</platform>
|
||||||
|
</sdk>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
</project>
|
</project>
|
||||||
@@ -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
|
||||||
Reference in new issue
Block a user