Skip to content

Commit 174f9f4

Browse files
author
Hartmut Arlt
committed
Release XLT 5.0.1
Merge branch 'develop'
2 parents 115b069 + 21b0d56 commit 174f9f4

6 files changed

Lines changed: 111 additions & 85 deletions

File tree

‎ant-scripts/test.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<project name="XLT-Test" basedir=".." default="test.full" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
3+
<project name="XLT-Test" basedir=".." default="test.full" xmlns:resolver="antlib:org.apache.maven.resolver.ant">
44

55
<property file="build.properties" />
66

@@ -53,23 +53,32 @@
5353
<condition property="classpath.set">
5454
<and>
5555
<isreference refid="classpath" />
56-
<isreference refid="maven-ant-tasks.classpath" />
56+
<isreference refid="maven-resolver-ant-tasks.classpath" />
5757
<isset property="build.doc.dir" />
5858
</and>
5959
</condition>
6060

6161
<fail unless="classpath.set" message="This project cannot be run stand-alone." />
6262

63-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
63+
<typedef resource="org/apache/maven/resolver/ant/antlib.xml" uri="antlib:org.apache.maven.resolver.ant" classpathref="maven-resolver-ant-tasks.classpath" />
6464

65-
<artifact:dependencies scopes="test" filesetId="test.fileset">
66-
<pom file="${basedir}/pom.xml" />
67-
</artifact:dependencies>
65+
<!-- redefine default Maven repo to be used with https -->
66+
<resolver:remoterepos id="resolver.repositories.test">
67+
<resolver:remoterepo url="https://repo1.maven.org/maven2/" />
68+
</resolver:remoterepos>
69+
70+
<resolver:pom id="xlt.pom" file="pom.xml" />
71+
72+
<resolver:dependencies id="depsFromPom" pomRef="xlt.pom" />
73+
74+
<resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories.test">
75+
<files refid="test.fileset" scopes="test" />
76+
</resolver:resolve>
6877

6978
<path id="test.classpath">
7079
<pathelement location="${test.classes.dir}" />
7180
<pathelement location="${test-hu.classes.dir}" />
72-
<fileset refid="test.fileset" />
81+
<resources refid="test.fileset" />
7382
<path refid="classpath" />
7483
</path>
7584

@@ -191,7 +200,7 @@
191200
<include name="**/*.class" />
192201
<exclude name="**/test/**/*.class" />
193202
<exclude name="**/*Test.class" />
194-
<exclude name="com/xceptance/xlt/license/**/*.class"/>
203+
<exclude name="com/xceptance/xlt/license/**/*.class" />
195204
<exclude name="com/gargoylesoftware/**/*.class" />
196205
<exclude name="org/openqa/selenium/**/*.class" />
197206
<exclude name="org/pegdown/**/*.class" />
@@ -257,7 +266,7 @@
257266
</checkstyle>
258267

259268
<!-- final transformation of checkstyle report -->
260-
<xslt classpathref="classpath" in="${reports.checkstyle.xml}/checkstyle_report.xml" out="${reports.checkstyle.html}/checkstyle_report.html" style="${styles.dir}/checkstyle-noframes.xsl"/>
269+
<xslt classpathref="classpath" in="${reports.checkstyle.xml}/checkstyle_report.xml" out="${reports.checkstyle.html}/checkstyle_report.html" style="${styles.dir}/checkstyle-noframes.xsl" />
261270
</target>
262271

263272
<!-- Analytics target -->

‎build.xml‎

Lines changed: 30 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<project name="XLT" default="all" basedir="." xmlns:xceptance="antlib:com.xceptance.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
2+
<project name="XLT" default="all" basedir="." xmlns:xceptance="antlib:com.xceptance.ant" xmlns:resolver="antlib:org.apache.maven.resolver.ant">
33

44
<property file="build.properties" />
55
<property environment="env" />
@@ -42,8 +42,8 @@
4242
</scriptdef>
4343

4444
<target name="init.mvn" unless="init.mvn.run">
45-
<path id="maven-ant-tasks.classpath" path="${lib-build.dir}/maven-ant-tasks-2.1.3.jar" />
46-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
45+
<path id="maven-resolver-ant-tasks.classpath" path="${lib-build.dir}/maven-resolver-ant-tasks-1.2.0-uber.jar" />
46+
<typedef resource="org/apache/maven/resolver/ant/antlib.xml" uri="antlib:org.apache.maven.resolver.ant" classpathref="maven-resolver-ant-tasks.classpath" />
4747

4848
<dependset>
4949
<srcfilelist dir="${basedir}">
@@ -55,24 +55,27 @@
5555
</targetfileset>
5656
</dependset>
5757

58-
<artifact:pom id="xlt.pom" file="pom.xml" inheritAllProperties="false" />
58+
<resolver:pom id="xlt.pom" file="pom.xml" />
5959

6060
<property name="version" value="${xlt.pom.version}" />
6161
<property name="bin.dist.name" value="${project.name}-${version}" />
6262
<property name="jar.name" value="${project.name}-${version}.jar" />
63-
63+
<property name="sourcejar.name" value="${project.name}-${version}-sources.jar" />
6464

6565
<!-- Name for the generated API documentation file without the file extension -->
6666
<property name="api.doc.file.name" value="${project.name}-${version}-javadoc" />
6767

68+
<!-- redefine default Maven repo to be used with https -->
69+
<resolver:remoterepos id="resolver.repositories">
70+
<resolver:remoterepo url="https://repo1.maven.org/maven2/" />
71+
</resolver:remoterepos>
6872

69-
<artifact:dependencies cacheDependencyRefs="true" scopes="compile" filesetId="deps.fileset" type="jar">
70-
<pom refid="xlt.pom" />
71-
</artifact:dependencies>
72-
<artifact:dependencies scopes="provided" filesetId="provided.fileset">
73-
<pom refid="xlt.pom" />
74-
</artifact:dependencies>
73+
<resolver:dependencies id="depsFromPom" pomRef="xlt.pom" />
7574

75+
<resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories">
76+
<files refid="deps.fileset" scopes="compile" />
77+
<files refid="provided.fileset" scopes="compile,provided" />
78+
</resolver:resolve>
7679

7780
<condition property="need.copy.deps">
7881
<or>
@@ -96,8 +99,8 @@
9699
<!-- the global classpath -->
97100
<path id="classpath">
98101
<pathelement path="${classes.dir}" />
99-
<fileset refid="deps.fileset" />
100-
<fileset refid="provided.fileset" />
102+
<resources refid="deps.fileset" />
103+
<resources refid="provided.fileset" />
101104
<fileset dir="${lib-build.dir}">
102105
<include name="*.jar" />
103106
</fileset>
@@ -147,7 +150,7 @@
147150
<mkdir dir="${lib.dir}" />
148151

149152
<copy todir="${lib.dir}">
150-
<fileset refid="deps.fileset" />
153+
<resources refid="deps.fileset" />
151154
<mapper type="flatten" />
152155
</copy>
153156

@@ -217,6 +220,14 @@
217220
</jar>
218221
</target>
219222

223+
<!-- Builds a JAR file from the sources. -->
224+
<target name="sourcejar" depends="init" description="Generates .jar file from the sources.">
225+
<jar jarfile="${build.dir}/${sourcejar.name}">
226+
<zipfileset dir="${src.dir}/main/java" />
227+
<zipfileset dir="${src.dir}/main/resources" />
228+
</jar>
229+
</target>
230+
220231
<!-- Documentation -->
221232
<target name="apidoc">
222233
<antcall target="doc" inheritrefs="true">
@@ -310,8 +321,8 @@
310321
</zipfileset>
311322
</zip>
312323
<jar destfile="${build.doc.dir}/${api.doc.file.name}.jar" basedir="${build.doc.dir}/apidoc/" />
313-
<zip zipfile="${dist.dir}/${bin.dist.name}.zip">
314324

325+
<zip zipfile="${dist.dir}/${bin.dist.name}.zip">
315326
<zipfileset dir="${basedir}" prefix="${bin.dist.name}">
316327
<include name="bin/**" />
317328
<exclude name="bin/**/*.sh" />
@@ -398,21 +409,21 @@
398409
<antcall target="release.task" inheritrefs="true" />
399410
</target>
400411

401-
<target name="release.task" depends="clean, dist, sigtest, fulltest">
412+
<target name="release.task" depends="clean, sourcejar, dist, sigtest, fulltest">
402413
<mkdir dir="${release.dir}" />
403414

404415
<copy todir="${release.dir}">
416+
<fileset dir="${basedir}" includes="pom.xml" />
405417
<fileset dir="${dist.dir}" includes="*.zip *.sha256" />
406418
<fileset dir="${build.tools.dir}" includes="*.xpi update.rdf" />
407419
<fileset dir="${build.doc.dir}" includes="${api.doc.file.name}.???" />
408420
<fileset file="${build.dir}/${jar.name}" />
421+
<fileset file="${build.dir}/${sourcejar.name}" />
409422
</copy>
410423
<zip destfile="${release.dir}/xltdocs.zip">
411424
<zipfileset dir="${build.doc.dir}/xlt" includes="**/*" />
412425
</zip>
413426

414-
<antcall target="writepom" inheritrefs="true" />
415-
416427
</target>
417428

418429
<!-- Downloads the EC2 on-demand instance information as JS file from AWS. -->
@@ -459,7 +470,6 @@
459470
</antcall>
460471
</target>
461472

462-
463473
<!--
464474
=====================================
465475
= API signature check and creation. =
@@ -478,7 +488,6 @@
478488
</antcall>
479489
</target>
480490

481-
482491
<!--
483492
==================
484493
= Generic tasks. =
@@ -499,7 +508,7 @@
499508
<target name="test" depends="compile">
500509
<ant antfile="${test.build.file}" target="test.${action}" inheritall="false" inheritrefs="false">
501510
<reference refid="classpath" />
502-
<reference refid="maven-ant-tasks.classpath" />
511+
<reference refid="maven-resolver-ant-tasks.classpath" />
503512
<propertyset>
504513
<propertyref name="build.doc.dir" />
505514
</propertyset>
@@ -516,32 +525,6 @@
516525
</ant>
517526
</target>
518527

519-
<!--
520-
==================================
521-
= POM generation and deployment. =
522-
==================================
523-
-->
524-
525-
<target name="check.pom.file" depends="init">
526-
<dependset>
527-
<srcfileset dir="${basedir}">
528-
<include name="pom.xml" />
529-
</srcfileset>
530-
<targetfileset dir="${release.dir}">
531-
<include name="pom.xml" />
532-
</targetfileset>
533-
</dependset>
534-
535-
<condition property="pom.exists">
536-
<available file="${release.dir}/pom.xml" type="file" />
537-
</condition>
538-
</target>
539-
540-
<target name="writepom" unless="pom.exists" depends="check.pom.file">
541-
<mkdir dir="${release.dir}" />
542-
<artifact:writepom pomRefId="xlt.pom" file="${release.dir}/pom.xml" />
543-
</target>
544-
545528
<!--
546529
==================================
547530
= Timer-recorder extension. =

‎doc/xltdoc/release-notes/5.0.x.textile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,33 @@ position: 984
55
sorted: true
66
---
77

8+
h2. XLT 5.0.1
9+
10+
The main goal of this release was to prepare everything needed so that XLT can be published to "Maven Central":https://search.maven.org/artifact/com.xceptance/xlt. This means that from now on XLT will be hosted there instead of the Xceptance repository. Consequently, you'll no longer need to configure the Xceptance repository in your @pom.xml@:
11+
12+
bc(plain)..
13+
<!-- Xceptance repo no longer needed. -->
14+
<!-- <repositories> -->
15+
<!-- <repository> -->
16+
<!-- <id>xc-nexus</id> -->
17+
<!-- <url>https://lab.xceptance.de/nexus/content/groups/public</url> -->
18+
<!-- </repository> -->
19+
<!-- </repositories> -->
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>com.xceptance</groupId>
24+
<artifactId>xlt</artifactId>
25+
<version>5.0.1</version>
26+
</dependency>
27+
</dependencies>
28+
29+
p. Furthermore, this release fixes an @ArrayIndexOutOfBoundsException@ thrown sporadically by HtmlUnit's HTML parser.
30+
31+
p. See "here":https://github.com/Xceptance/XLT/milestone/2 for the complete list of improvements and fixes.
32+
33+
34+
835
h2. XLT 5.0.0
936

1037
h3. XLT Goes Open Source

‎lib-build/maven-ant-tasks-2.1.3.jar‎

-1.26 MB
Binary file not shown.

‎lib-build/maven-resolver-ant-tasks-1.2.0-uber.jar‎

5.92 MB
Binary file not shown.

0 commit comments

Comments
 (0)