Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused killAfter options #394

Merged
merged 1 commit into from
Nov 12, 2023
Merged

Remove unused killAfter options #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 1 addition & 15 deletions src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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