From 71febd6d9b4240c1f9d0a42776f84d7480491f01 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Thu, 12 Jun 2014 17:03:57 +0200
Subject: [PATCH] ForgPW: Force maven-plugin version 3.7.0; enable
---
metadata/de.serverfrog.pw.android.txt | 6 ++++--
metadata/org.chorem.android.saymytexts.txt | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/metadata/de.serverfrog.pw.android.txt b/metadata/de.serverfrog.pw.android.txt
index 68ca4fb7fd..5d6969e295 100644
--- a/metadata/de.serverfrog.pw.android.txt
+++ b/metadata/de.serverfrog.pw.android.txt
@@ -15,11 +15,11 @@ Repo Type:git
Repo:https://github.com/Serverfrog/FrogPw.git
Build:0.1.2,1016
- disable=requires maven 3.1.1
commit=b35bc593507e275d7cbe6b207b4e40170b68ecb2
subdir=FrogPw-Android
maven=yes@..
- prebuild=sed -i -e 's@<phase>package</phase>@<phase>none</phase>@g' pom.xml
+ prebuild=sed -i -e 's@<phase>package</phase>@<phase>none</phase>@g' \
+ -e 's@<android.mavenversion>3.8.2</android.mavenversion>@<android.mavenversion>3.7.0</android.mavenversion>@g' pom.xml
Maintainer Notes:
Need to figure out a better way to disable signing than to run that sed command.
@@ -27,6 +27,8 @@ Need to figure out a better way to disable signing than to run that sed command.
Version mismatch: Version Code from the APK seems to ber versionCode + 1
Use UCM:Tags once the tags have valid Android maven projects - the tag 0.1.1 is not yet buildable.
+
+Remove second sed command when build server uses mvn-3.1.1+.
.
Auto Update Mode:None
diff --git a/metadata/org.chorem.android.saymytexts.txt b/metadata/org.chorem.android.saymytexts.txt
index 74ade76a5e..0e517a9535 100644
--- a/metadata/org.chorem.android.saymytexts.txt
+++ b/metadata/org.chorem.android.saymytexts.txt
@@ -19,7 +19,7 @@ Build:2.0.1,4
maven=yes
prebuild=sed -i 's@<version>3.8.2</version>@<version>3.7.0</version>@g' pom.xml
-Maintainer Notice:
+Maintainer Notes:
Remove prebuild when build server is no longer stuck at mvn-3.0.5. Check
the sed script at every release as it matches quite a lot: Don't use sed
for XML manipulation...