Skip to content

Commit b08fba0

Browse files
Remove unused killAfter options
When used only warning is generated by plugin.
1 parent 6fae009 commit b08fba0

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public class ExecJavaMojo
174174
* Maven will continue on while the affected threads (and related objects in memory) linger on. Consider setting
175175
* this to <code>true</code> if you are invoking problematic code that you can't fix. An example is
176176
* {@link java.util.Timer} which doesn't respond to interruption. To have <code>Timer</code> fixed, vote for
177-
* <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6336543">this bug</a>.
177+
* <a href="https://bugs.java.com/bugdatabase/view_bug?bug_id=6336543">this bug</a>.
178178
* <p>
179179
* <b>Note:</b> In JDK 20+, the long deprecated {@link Thread#stop()} (since JDK 1.2) has been removed and will
180180
* throw an {@link UnsupportedOperationException}. This will be handled gracefully, yielding a log warning
@@ -185,16 +185,6 @@ public class ExecJavaMojo
185185
@Parameter( property = "exec.stopUnresponsiveDaemonThreads", defaultValue = "false" )
186186
private boolean stopUnresponsiveDaemonThreads;
187187

188-
/**
189-
* Deprecated this is not needed anymore.
190-
*
191-
* @deprecated since 1.1-alpha-1
192-
* @since 1.0
193-
*/
194-
@Parameter( property = "exec.killAfter", defaultValue = "-1" )
195-
@Deprecated
196-
private long killAfter;
197-
198188
private Properties originalSystemProperties;
199189

200190
/**
@@ -247,10 +237,6 @@ public void execute()
247237
getLog().info( "skipping execute as per configuration" );
248238
return;
249239
}
250-
if ( killAfter != -1 )
251-
{
252-
getLog().warn( "Warning: killAfter is now deprecated. Do you need it ? Please comment on MEXEC-6." );
253-
}
254240

255241
if ( null == arguments )
256242
{

src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ private String execute( File pom, String goal, ByteArrayOutputStream stringOutpu
336336

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

0 commit comments

Comments
 (0)