Merge branch 'fix_regalandroid' into 'master'

ReGalAndroid: Fix build of version 1.2.0

Build (on clean buildserver), install and functionality tested.

See merge request !516
This commit is contained in:
Boris Kraut 2015-01-20 21:55:40 +00:00
commit 2e3f4d426e

View file

@ -37,32 +37,21 @@ Build:1.1.2,5000
subdir=regalandroid
Build:1.2.0,6
disable=g2-java-client
commit=regalandroid-1.2.0
maven=yes
subdir=regalandroid
prebuild=sed -i 's/3.9.0-rc.1/3.9.0-rc.3/g' ../regalandroid-parent/pom.xml
build=cd ../commons-gallery && $$MVN3$$ install && \
cd ../g2-java-client && $$MVN3$$ install && \
cd ../g3-java-client && $$MVN3$$ install && \
cd ../jiwigo-ws-api && $$MVN3$$ install && \
cd ../jiwigo-ws-api-converter && $$MVN3$$ install
build=cd ../regalandroid-parent && $$MVN3$$ clean install && \
cd ../ && $$MVN3$$ clean install && cd ./regalandroid
Build:1.2.1,7
disable=Only a snapshot is currently tagged, build untested.
disable=Only tagged as "SNAPSHOT" without changes to 1.2.0
commit=regalandroid-1.2.1
maven=yes
subdir=regalandroid
prebuild=sed -i 's/3.9.0-rc.1/3.9.0-rc.3/g' ../regalandroid-parent/pom.xml
build=cd ../commons-gallery && $$MVN3$$ install && \
cd ../g2-java-client && $$MVN3$$ install && \
cd ../g3-java-client && $$MVN3$$ install && \
cd ../jiwigo-ws-api && $$MVN3$$ install && \
cd ../jiwigo-ws-api-converter && $$MVN3$$ install
Maintainer Notes:
[ERROR] Failed to execute goal on project g2-java-client: Could not resolve dependencies for project net.dahanne.gallery2:g2-java-client:jar:1.2.0: Failed to collect dependencies for [org.apache.httpcomponents:httpclient:jar:4.0.1 (compile), org.json:json:jar:20090211 (compile), com.google.guava:guava:jar:r06 (test), junit:junit:jar:4.10 (test), org.apache.httpcomponents:httpmime:jar:4.0.3 (compile), net.dahanne.gallery:commons-gallery:jar:1.2.0 (compile), commons-lang:commons-lang:jar:2.4 (compile)]: Failed to read artifact descriptor for net.dahanne.gallery:commons-gallery:jar:1.2.0: Could not find artifact net.dahanne.android:regalandroid-parent:pom:1.2.0 in central (http://repo.maven.apache.org/maven2) -> [Help 1]
.
build=cd ../regalandroid-parent && $$MVN3$$ clean install && \
cd ../ && $$MVN3$$ clean install && cd ./regalandroid
Auto Update Mode:None
Update Check Mode:RepoManifest