Skip to content

Commit

Permalink
Remove unused killAfter options
Browse files Browse the repository at this point in the history
When used only warning is generated by plugin.
  • Loading branch information
slawekjaranowski committed Nov 12, 2023
1 parent 6fae009 commit b08fba0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
16 changes: 1 addition & 15 deletions src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java
Expand Up @@ -174,7 +174,7 @@ public class ExecJavaMojo
* Maven will continue on while the affected threads (and related objects in memory) linger on. Consider setting
* this to <code>true</code> if you are invoking problematic code that you can't fix. An example is
* {@link java.util.Timer} which doesn't respond to interruption. To have <code>Timer</code> fixed, vote for
* <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6336543">this bug</a>.
* <a href="https://bugs.java.com/bugdatabase/view_bug?bug_id=6336543">this bug</a>.
* <p>
* <b>Note:</b> In JDK 20+, the long deprecated {@link Thread#stop()} (since JDK 1.2) has been removed and will
* throw an {@link UnsupportedOperationException}. This will be handled gracefully, yielding a log warning
Expand All @@ -185,16 +185,6 @@ public class ExecJavaMojo
@Parameter( property = "exec.stopUnresponsiveDaemonThreads", defaultValue = "false" )
private boolean stopUnresponsiveDaemonThreads;

/**
* Deprecated this is not needed anymore.
*
* @deprecated since 1.1-alpha-1
* @since 1.0
*/
@Parameter( property = "exec.killAfter", defaultValue = "-1" )
@Deprecated
private long killAfter;

private Properties originalSystemProperties;

/**
Expand Down Expand Up @@ -247,10 +237,6 @@ public void execute()
getLog().info( "skipping execute as per configuration" );
return;
}
if ( killAfter != -1 )
{
getLog().warn( "Warning: killAfter is now deprecated. Do you need it ? Please comment on MEXEC-6." );
}

if ( null == arguments )
{
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
Expand Up @@ -336,7 +336,6 @@ private String execute( File pom, String goal, ByteArrayOutputStream stringOutpu

// why isn't this set up by the harness based on the default-value? TODO get to bottom of this!
setVariableValueToObject( mojo, "includeProjectDependencies", Boolean.TRUE );
setVariableValueToObject( mojo, "killAfter", (long) -1 );
setVariableValueToObject( mojo, "cleanupDaemonThreads", Boolean.TRUE );
setVariableValueToObject( mojo, "classpathScope", "compile" );

Expand Down

0 comments on commit b08fba0

Please sign in to comment.