Skip to content

Remove the org.jruby.ant Ant tasks and the Ant build dependency #9766

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

Merged
headius merged 1 commit into from
Oct 3, 2026
Merged

Remove the org.jruby.ant Ant tasks and the Ant build dependency #9766

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/pom.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
jar 'org.jruby:jzlib:1.1.5'
jar 'junit:junit', scope: 'test'
jar 'org.awaitility:awaitility', scope: 'test'
jar 'org.apache.ant:ant:${ant.version}', scope: 'provided'
jar 'org.osgi:org.osgi.core:5.0.0', scope: 'provided'

# joda timezone must be before joda-time to be packed correctly
Expand Down
6 changes: 0 additions & 6 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@ DO NOT MODIFY - GENERATED CODE
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${ant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Expand Down
24 changes: 0 additions & 24 deletions core/src/main/java/org/jruby/ant/Rake.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions core/src/main/java/org/jruby/ant/RakeImport.java
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions core/src/main/java/org/jruby/ant/RakeTaskBase.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jruby.ir.passes;

import org.apache.tools.ant.util.CollectionUtils;
import org.jruby.ir.*;
import org.jruby.ir.instructions.*;
import org.jruby.ir.interpreter.FullInterpreterContext;
Expand Down
6 changes: 4 additions & 2 deletions core/src/test/java/org/jruby/embed/ReaderInputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
Expand All @@ -45,7 +48,6 @@
import java.util.logging.SimpleFormatter;
import java.util.logging.StreamHandler;

import org.apache.tools.ant.util.FileUtils;
import org.jruby.embed.io.ReaderInputStream;
import org.junit.After;
import org.junit.AfterClass;
Expand Down Expand Up @@ -203,7 +205,7 @@ public void testRead_3args_bigfile() throws Exception {
}
}
instance.close();
String expected = FileUtils.readFully(new FileReader(filename2));
String expected = Files.readString(Path.of(filename2), Charset.defaultCharset());
assertEquals(expected.trim(), sb.toString().trim());
}

Expand Down
1 change: 0 additions & 1 deletion pom.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
# used in ./lib/pom.rb and ./maven/jruby-stdlib/pom.rb
"rake.version": '13.4.2',
"jruby-launcher.version": '1.1.6',
"ant.version": '1.9.8',
"asm.version": '9.10.1',
"jar-dependencies.version": '0.4.1',
"jffi.version": '1.4.3',
Expand Down
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ DO NOT MODIFY - GENERATED CODE
</site>
</distributionManagement>
<properties>
<ant.version>1.9.8</ant.version>
<asm.version>9.10.1</asm.version>
<base.java.version>21</base.java.version>
<base.javac.version>21</base.javac.version>
Expand Down
3 changes: 0 additions & 3 deletions test/pom.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
jar 'org.livetribe:livetribe-jsr223:2.0.7'
jar 'org.jruby:jruby-core', '${project.version}'
end
scope :provided do
jar 'org.apache.ant:ant:${ant.version}'
end
jar('org.jruby:requireTest:1.0',
scope: 'system',
systemPath: '${project.basedir}/jruby/requireTest-1.0.jar')
Expand Down
Loading