Another attempt at fixing the version

Author: shai-almog

scripts/build-android-app.sh

@@ -116,11 +116,11 @@ ba_log "Generating Codename One application skeleton via codenameone-maven-plugi
 
 APP_DIR="$WORK_DIR/$ARTIFACT_ID"
 
-# --- Normalize CN1 versions without versions-maven-plugin ---
+# --- Normalize Codename One versions (safe for Maven parent resolution) ---
 
 ROOT_POM="$APP_DIR/pom.xml"
 
-# 1) Ensure codenameone.version property exists (or update it)
+# 0) Ensure property exists (you can keep this for deps/plugins)
 ensure_property() {
   local pom="$1" name="$2" value="$3"
   if ! grep -q "<properties>" "$pom"; then
@@ -138,29 +138,28 @@ ensure_property() {
     perl -0777 -pe "s|(<${name}>)[^<]+(</${name}>)|\$1${value}\$2|s" -i "$pom"
   fi
 }
-
 ensure_property "$ROOT_POM" "codenameone.version" "$CN1_VERSION"
 
-# 2) In every pom.xml:
-#    - Point <parent><version> to ${codenameone.version} for Codename One parent
-#    - Set com.codenameone dependencies/plugins <version>${codenameone.version}</version>
+# 1) Parent: set literal version (Maven DOES NOT allow a property here)
 while IFS= read -r -d '' P; do
-  # Parent version -> ${codenameone.version}
-  perl -0777 -pe 's!(<parent>\s*<groupId>com\.codenameone</groupId>\s*<artifactId>codenameone-maven-parent</artifactId>\s*<version>)[^<]+(</version>)!${1}${codenameone.version}${2}!s' -i "$P"
+  perl -0777 -pe 's!(<parent>\s*<groupId>com\.codenameone</groupId>\s*<artifactId>codenameone-maven-parent</artifactId>\s*<version>)[^<]+(</version>)!$1'"$CN1_VERSION"'$2!s' -i "$P"
+done < <(find "$APP_DIR" -type f -name pom.xml -print0)
 
-  # Dependencies (only com.codenameone)
+# 2) com.codenameone deps/plugins -> use the property (optional but tidy)
+while IFS= read -r -d '' P; do
   perl -0777 -pe 's!(<dependency>\s*<groupId>com\.codenameone[^<]*</groupId>\s*<artifactId>[^<]+</artifactId>\s*<version>)[^<]+(</version>)!${1}${codenameone.version}${2}!sg' -i "$P"
-
-  # Plugins (only com.codenameone)
   perl -0777 -pe 's!(<plugin>\s*<groupId>com\.codenameone[^<]*</groupId>\s*<artifactId>[^<]+</artifactId>\s*<version>)[^<]+(</version>)!${1}${codenameone.version}${2}!sg' -i "$P"
 done < <(find "$APP_DIR" -type f -name pom.xml -print0)
 
-# 3) Build with the property set so any missed spots still resolve correctly
+# 3) Build with the property set (covers any missed spots)
 EXTRA_MVN_ARGS+=("-Dcodenameone.version=${CN1_VERSION}")
 
-grep -nA2 -B2 '<parent>' "$APP_DIR/pom.xml"
-grep -nA3 -B3 '<pluginManagement>' "$APP_DIR/pom.xml"
+# Show parent block without failing the build
+grep -n -A3 -B3 '<parent>' "$APP_DIR/pom.xml" || true
 
+# Optional: dump effective POM to inspect pluginManagement
+"${MAVEN_HOME}/bin/mvn" -q -f "$APP_DIR/pom.xml" help:effective-pom -Doutput="$APP_DIR/effective-pom.xml" || true
+tail -n +1 "$APP_DIR/effective-pom.xml" | sed -n '1,200p' >/dev/null || true
 
 [ -d "$APP_DIR" ] || { ba_log "Failed to create Codename One application project" >&2; exit 1; }
 [ -f "$APP_DIR/build.sh" ] && chmod +x "$APP_DIR/build.sh"