Skip to content

Commit

Permalink
Let’s use Ivy (properly!) and drop Maven Ant tasks + Commons OpenPGP
Browse files Browse the repository at this point in the history
  • Loading branch information
twogee committed Jul 18, 2021
1 parent 4c49cd5 commit d4b599a
Show file tree
Hide file tree
Showing 13 changed files with 356 additions and 545 deletions.
2 changes: 1 addition & 1 deletion ReleaseInstructions
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Note: This document was adapted from the one created in the context of

10. Sign the distribution files

There are two aproaches, one uses Ant and a few libraries, the
There are two approaches, one uses Ant and a few libraries, the
other requires you to run gnupg manually. The first version didn't
work for Stefan when he built the first release candidate for
1.9.7.
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions lib/libraries.properties → attic/libraries.properties
Original file line number Diff line number Diff line change
Expand Up @@ -36,34 +36,34 @@ netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
ivy.version=2.5.0
ant-antunit.version=1.4.1
antlr.version=2.7.7
bcel.version=6.4.1
bcel.version=6.5.0
bsf.version=2.4.0
bsh.version=2.0b5
commons-net.version=3.6
commons-net.version=3.8.0
commons-logging.version=1.1
commons-logging-api.version=${commons-logging.version}
js.version=20.1.0
js.version=21.1.0
js-scriptengine.version=${js.version}
hamcrest-core.version=1.3
hamcrest-library.version=${hamcrest-core.version}
jai-core.version=1.1.3
jai-codec.version=1.1.3
jakarta.mail.version=1.6.4
jakarta.mail.version=1.6.5
jakarta-regexp.version=1.4
# Later versions of Tomcat provide a jspc task
jasper-compiler.version=4.1.36
jasper-runtime.version=${jasper-compiler.version}
jdepend.version=2.9.1
jruby.version=1.6.8
junit.version=4.13.1
rhino.version=1.7.11
junit.version=4.13.2
rhino.version=1.7.13
junit-platform-launcher.version=1.2.0
# Only used for internal tests in Ant project
junit-vintage-engine.version=5.2.0
# Only used for internal tests in Ant project
junit-jupiter-engine.version=5.2.0
jsch.version=0.1.55
jython.version=2.7.0
jython.version=2.7.2
# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
log4j.version=1.2.14
oro.version=2.0.8
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@
<mkdir dir="${dist.etc}"/>

<copy todir="${dist.lib}" file="${lib.dir}/README"/>
<copy todir="${dist.lib}" file="${lib.dir}/libraries.properties"/>
<copy todir="${dist.lib}" file="${basedir}/ivy.xml"/>

<copy todir="${dist.lib}">
<fileset dir="${src.dir}/etc/poms">
Expand Down Expand Up @@ -1192,7 +1192,7 @@
<include name="optional/junit*.jar"/>
<include name="optional/hamcrest*.jar"/>
<include name="README"/>
<include name="libraries.properties"/>
<include name="ivy.xml"/>
</fileset>
</copy>

Expand Down
Loading

0 comments on commit d4b599a

Please sign in to comment.