Files
idlj-maven-plugin/idlj-maven-plugin-mpt4.patch

183 lines
5.5 KiB
Diff
Raw Permalink Normal View History

--- idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/AbstractIDLJMojo.java 2025-03-27 12:11:09.167798230 +0100
+++ idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/AbstractIDLJMojo.java 2025-03-27 12:38:05.222110975 +0100
@@ -21,6 +21,8 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
@@ -48,50 +50,49 @@
/**
* A <code>List</code> of <code>Source</code> configurations to compile.
*
- * @parameter
*/
+ @Parameter
private List<Source> sources;
/**
* Activate more detailed debug messages.
*
- * @parameter debug
*/
+ @Parameter
private boolean debug;
/**
* Should the plugin fail the build if there's an error while generating sources from IDLs.
*
- * @parameter default-value="true"
*/
+ @Parameter( defaultValue = "true" )
private boolean failOnError;
- /**
- * @parameter property="project"
- * @required
- * @readonly
- */
+ @Parameter( property = "project",
+ required = true,
+ readonly = true )
private MavenProject project;
/**
* The granularity in milliseconds of the last modification date for testing whether a source needs recompilation.
*
- * @parameter property="lastModGranularityMs" default-value="0"
*/
+ @Parameter( property = "lastModGranularityMs",
+ defaultValue = "0" )
private int staleMillis;
/**
* The maven project helper class for adding resources.
*
- * @component role="org.apache.maven.project.MavenProjectHelper"
*/
+ @Component( role = MavenProjectHelper.class )
private MavenProjectHelper projectHelper;
/**
* The directory to store the processed grammars. Used so that grammars are not constantly regenerated.
*
- * @parameter default-value="${project.build.directory}/idlj-timestamp"
*/
+ @Parameter( defaultValue = "${project.build.directory}/idlj-timestamp" )
private File timestampDirectory;
/**
@@ -99,8 +100,8 @@
* Should be either "idlj", "glassfish", or "jacorb". If not specified, will select idlj or glassfish,
* based on Java version
*
- * @parameter
*/
+ @Parameter
private String compiler;
/**
--- idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/IDLJMojo.java 2025-03-27 12:11:09.168031993 +0100
+++ idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/IDLJMojo.java 2025-03-27 12:36:03.405128428 +0100
@@ -19,6 +19,10 @@
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
import java.io.File;
/**
@@ -26,31 +30,31 @@
*
* @author Alan D. Cabrera <adc@apache.org>
* @version $Id$
- * @goal generate
- * @phase generate-sources
*/
+@Mojo( name = "generate",
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES )
public class IDLJMojo
extends AbstractIDLJMojo
{
/**
* The source directory containing *.idl files.
*
- * @parameter default-value="${basedir}/src/main/idl"
*/
+ @Parameter( defaultValue = "${basedir}/src/main/idl" )
private File sourceDirectory;
/**
* Additional include directories containing additional *.idl files required for compilation.
*
- * @parameter
*/
+ @Parameter
private File[] includeDirs;
/**
* The directory to output the generated sources to.
*
- * @parameter default-value="${project.build.directory}/generated-sources/idl"
*/
+ @Parameter( defaultValue = "${project.build.directory}/generated-sources/idl" )
private File outputDirectory;
--- idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/TestIDLJMojo.java 2025-03-27 12:11:09.168264638 +0100
+++ idlj-maven-plugin-1.2.2/src/main/java/org/codehaus/mojo/idlj/TestIDLJMojo.java 2025-03-27 12:36:41.389234933 +0100
@@ -19,6 +19,10 @@
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
import java.io.File;
/**
@@ -26,24 +30,24 @@
*
* @author maguro <adc@apache.org>
* @version $Id$
- * @goal generate-test
- * @phase generate-test-sources
*/
+@Mojo( name = "generate-test",
+ defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES )
public class TestIDLJMojo
extends AbstractIDLJMojo
{
/**
* The source directory containing *.idl files.
*
- * @parameter default-value="${basedir}/src/test/idl"
*/
+ @Parameter( defaultValue = "${basedir}/src/test/idl" )
private File sourceDirectory;
/**
* Additional include directories containing additional *.idl files required for compilation.
*
- * @parameter
*/
+ @Parameter
private File[] includeDirs;
/**
@@ -51,6 +55,7 @@
*
* @parameter default-value="${project.build.directory}/generated-test-sources/idl"
*/
+ @Parameter( defaultValue = "${project.build.directory}/generated-test-sources/idl" )
private File outputDirectory;
/**