From 60f8e28edbc0db9d44ad4c3df778edad3d4c7d4a Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 16 Feb 2024 21:49:08 +0100
Subject: [PATCH] Support java source property being discovered as 1.x

---
 .../maven/AbstractModelloSourceGeneratorMojo.java        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java
index a107bd851..54e7eb5a1 100644
--- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java
+++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java
@@ -94,13 +94,12 @@ protected void customizeParameters(Properties parameters) {
             parameters.setProperty(ModelloParameterConstants.ENCODING, encoding);
         }
 
-        if (javaSource != null) {
-            if (javaSource.startsWith("1.")) {
-                javaSource = javaSource.substring("1.".length());
-            }
-        } else {
+        if (javaSource == null) {
             javaSource = discoverJavaSource();
         }
+        if (javaSource.startsWith("1.")) {
+            javaSource = javaSource.substring("1.".length());
+        }
         getLog().debug("javaSource=" + javaSource);
         parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource);