Steffen Schaefer
fca622efa7
Merge branch 'master' into android-maven-build-bug3190
...
Conflicts:
java/com.sap.sailing.domain.common/pom.xml
java/com.sap.sailing.domain.shared.android/pom.xml
java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml
java/com.sap.sse.common/pom.xml
java/com.sap.sse.datamining.annotations/pom.xml
java/com.sap.sse.security.common/pom.xml
java/org.json.simple/pom.xml
java/pom.xml
mobile/com.sap.sailing.android.shared/pom.xml
mobile/com.sap.sailing.racecommittee.app/pom.xml
mobile/pom.xml
pom.xml
2015-11-30 15:02:06 +01:00
Steffen Schaefer
3c25092bc5
Consistently using spaces for intendiation in several POMs
2015-11-30 14:55:28 +01:00
Steffen Schaefer
fc8a893e8c
Maven profiles can only be copntrolled by system properties and not
...
Maven properties of a parent POM. The presence of the "ldi.releaseBuild"
is a good match for the activation conditions of "with-mobile" and
"with-not-android-relevant". It currently seems that in
buildAndUpdataProduct.sh the profiles are correctly activated and
deactivated. So this could also correctly work for local builds.
2015-11-24 14:47:13 +01:00
Steffen Schaefer
7248728674
Changed the activation of "with-mobile" and "with-not-android-relevant"
...
profiles based on a new property "mobile.build.is.default" so that no
changes are needed for this on the release branch
2015-11-24 14:01:17 +01:00
Steffen Schaefer
f63f1c9039
Removed unused maven config that was moved to the parent POM
2015-11-16 08:25:01 +01:00
Steffen Schaefer
8de15d028e
Profile with-mobile isn't active by default for more projects
2015-11-11 11:32:30 +01:00
Steffen Schaefer
29eae8056e
Revert "upgraded versions to 1.1.0"
...
This reverts commit 08ecfb3014 .
2015-11-10 17:10:14 +01:00
Axel Uhl
08ecfb3014
upgraded versions to 1.1.0
2015-10-23 13:01:48 +02:00
Steffen Schaefer
f0f227c3b7
Revert "with-mobile profile isn't active by default anymore so building the webapp without apps is the default"
...
This reverts commit 90df750312 .
2015-10-06 08:50:14 +02:00
Steffen Schaefer
90df750312
with-mobile profile isn't active by default anymore so building the
...
webapp without apps is the default
2015-10-06 08:37:26 +02:00
Papick Garcia Taboada
60c7462fca
Moved mobile build aar configuration into java parent pom
2015-09-29 15:52:05 +02:00
Papick Garcia Taboada
b71dc3addd
Added android packaging plugins to "with-mobile" profiles
2015-09-16 11:58:48 +02:00
Steffen Schaefer
8d06e7918f
Using Android SDK 22 to be consistent with the gradle build
2015-09-15 10:13:39 +02:00
Steffen Schaefer
2c3feadeb1
Added excludes for AAR classes.jar
2015-08-13 16:32:08 +02:00
Steffen Schaefer
ebc0ecd140
Building aar for more subprojects needed by the apps
2015-08-13 14:26:36 +02:00
Fredrik Teschke
c861fcbd74
upgrade poms of shared and common bundles to 1.7 compiler level
2015-02-10 03:09:27 +01:00
Axel Uhl
485cba10fb
added pom.xml for com.sap.sailing.server.gateway.serialization.shared.android
2015-01-14 13:37:48 +01:00