Reduced changes

Author: shai-almog

maven/codenameone-maven-plugin/src/main/java/com/codename1/maven/GenerateAppProjectMojo.java

@@ -50,12 +50,6 @@ public class GenerateAppProjectMojo extends AbstractMojo {
     @Parameter(property="version", defaultValue = "1.0-SNAPSHOT")
     private String version;
 
-    @Parameter(property="archetypeCatalog", defaultValue = "local")
-    private String archetypeCatalog;
-
-    @Parameter(property = "bootstrapArchetypeVersion", defaultValue = "7.0.204")
-    private String bootstrapArchetypeVersion;
-
 
     private Properties loadSourceProjectProperties() throws IOException {
         Properties props = new Properties();
@@ -79,14 +73,6 @@ private void generateProject() throws MojoExecutionException{
             MavenXpp3Reader reader = new MavenXpp3Reader();
             Model model = reader.read(getClass().getResourceAsStream("/META-INF/maven/com.codenameone/codenameone-maven-plugin/pom.xml"));
             archetypeVersion = model.getVersion();
-            if (archetypeVersion != null && archetypeVersion.endsWith("-SNAPSHOT")) {
-                String bootstrapVersion = bootstrapArchetypeVersion != null ? bootstrapArchetypeVersion.trim() : "";
-                if (bootstrapVersion.isEmpty()) {
-                    bootstrapVersion = "LATEST";
-                }
-                getLog().info("Detected snapshot plugin version " + archetypeVersion + ". Bootstrapping cn1app-archetype using " + bootstrapVersion + ".");
-                archetypeVersion = bootstrapVersion;
-            }
         } catch (Exception ex) {
             getLog().warn("Attempted to read archetype version from embedded pom.xml file but failed", ex);
         }
@@ -118,13 +104,6 @@ private void generateProject() throws MojoExecutionException{
             }
         }
 
-        if (archetypeCatalog != null) {
-            String catalog = archetypeCatalog.trim();
-            if (!catalog.isEmpty()) {
-                props.setProperty("archetypeCatalog", catalog);
-            }
-        }
-
         if (getLog().isDebugEnabled()) {
             request.setDebug(true);
         }
@@ -133,19 +112,6 @@ private void generateProject() throws MojoExecutionException{
         request.setProperties(props);
 
         Invoker invoker = new DefaultInvoker();
-        invoker.setInputStream(new ByteArrayInputStream(new byte[0]));
-        invoker.setOutputHandler(line -> {
-            if (line == null || line.contains("Progress (")) {
-                return;
-            }
-            getLog().info(line);
-        });
-        invoker.setErrorHandler(line -> {
-            if (line == null || line.contains("Progress (")) {
-                return;
-            }
-            getLog().error(line);
-        });
         try {
             InvocationResult result = invoker.execute( request );
             if (result.getExitCode() != 0) {

scripts/build-android-app.sh

@@ -126,12 +126,12 @@ ba_log "Generating Codename One application skeleton via codenameone-maven-plugi
 (
   cd "$WORK_DIR"
   xvfb-run -a "${MAVEN_CMD[@]}" -q \
-    com.codenameone:codenameone-maven-plugin:"$CN1_VERSION":generate-app-project \
+    com.codenameone:codenameone-maven-plugin:7.0.204:generate-app-project \
     -DgroupId="$GROUP_ID" \
     -DartifactId="$ARTIFACT_ID" \
     -Dversion=1.0-SNAPSHOT \
     -DsourceProject="$SOURCE_PROJECT" \
-    -Dcn1Version="$CN1_VERSION" \
+    -Dcn1Version="7.0.204" \
     "${EXTRA_MVN_ARGS[@]}"
 )