Fridrich Strba 2023-09-05 10:12:38 +00:00 committed by Git OBS Bridge
parent 333cf1b7c4
commit 3e33eebc7a

View File

@ -1,7 +1,20 @@
diff -urEbwB modello-2.1.2.orig/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
--- modello-2.1.2.orig/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-04 23:38:10.194571922 +0200
+++ modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-04 23:40:24.188819301 +0200
@@ -110,6 +110,10 @@
--- modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-04 23:38:10.194571922 +0200
+++ modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-05 12:10:26.198361088 +0200
@@ -105,11 +105,24 @@
System.exit(1);
}
+ if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) ) {
+ // The old useJava5 parameter at this position
+ System.err.println( "Missing required parameter: Java Source (replacing the old \"Use Java5\" parameter)" );
+
+ usage();
+
+ System.exit( 1 );
+ }
+
parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource);
if (args.length > 6) {
parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]);
}
@ -12,7 +25,7 @@ diff -urEbwB modello-2.1.2.orig/modello-core/src/main/java/org/codehaus/modello/
}
// ----------------------------------------------------------------------
@@ -118,6 +122,6 @@
@@ -118,6 +131,6 @@
private static void usage() {
System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"