Skip to content

Commit b8e03d9

Browse files
committed
Let’s use Ivy (properly!) and drop Maven Ant tasks + Commons OpenPGP
1 parent 6dee370 commit b8e03d9

13 files changed

+352
-545
lines changed

ReleaseInstructions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Note: This document was adapted from the one created in the context of
126126

127127
10. Sign the distribution files
128128

129-
There are two aproaches, one uses Ant and a few libraries, the
129+
There are two approaches, one uses Ant and a few libraries, the
130130
other requires you to run gnupg manually. The first version didn't
131131
work for Stefan when he built the first release candidate for
132132
1.9.7.
File renamed without changes.

lib/libraries.properties renamed to attic/libraries.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@ netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
3636
ivy.version=2.5.0
3737
ant-antunit.version=1.4
3838
antlr.version=2.7.7
39-
bcel.version=6.4.1
39+
bcel.version=6.5.0
4040
bsf.version=2.4.0
4141
bsh.version=2.0b5
42-
commons-net.version=3.6
42+
commons-net.version=3.7.2
4343
commons-logging.version=1.1
4444
commons-logging-api.version=${commons-logging.version}
45-
js.version=20.1.0
45+
js.version=21.0.0
4646
js-scriptengine.version=${js.version}
4747
hamcrest-core.version=1.3
4848
hamcrest-library.version=${hamcrest-core.version}
4949
jai-core.version=1.1.3
5050
jai-codec.version=1.1.3
51-
jakarta.mail.version=1.6.4
51+
jakarta.mail.version=1.6.5
5252
jakarta-regexp.version=1.4
5353
# Later versions of Tomcat provide a jspc task
5454
jasper-compiler.version=4.1.36
5555
jasper-runtime.version=${jasper-compiler.version}
5656
jdepend.version=2.9.1
5757
jruby.version=1.6.8
58-
junit.version=4.13.1
59-
rhino.version=1.7.11
58+
junit.version=4.13.2
59+
rhino.version=1.7.13
6060
junit-platform-launcher.version=1.2.0
6161
# Only used for internal tests in Ant project
6262
junit-vintage-engine.version=5.2.0
6363
# Only used for internal tests in Ant project
6464
junit-jupiter-engine.version=5.2.0
6565
jsch.version=0.1.55
66-
jython.version=2.7.0
66+
jython.version=2.7.2
6767
# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
6868
log4j.version=1.2.14
6969
oro.version=2.0.8
File renamed without changes.

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@
10771077
<mkdir dir="${dist.etc}"/>
10781078

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

10821082
<copy todir="${dist.lib}">
10831083
<fileset dir="${src.dir}/etc/poms">
@@ -1192,7 +1192,7 @@
11921192
<include name="optional/junit*.jar"/>
11931193
<include name="optional/hamcrest*.jar"/>
11941194
<include name="README"/>
1195-
<include name="libraries.properties"/>
1195+
<include name="ivy.xml"/>
11961196
</fileset>
11971197
</copy>
11981198

0 commit comments

Comments
 (0)