Release XLT 5.0.1

Merge branch 'develop'
Xceptance · Mar 12, 2020 · 174f9f4 · 174f9f4
2 parents 115b069 + 21b0d56
commit 174f9f4
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 85 deletions.
diff --git a/ant-scripts/test.xml b/ant-scripts/test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="XLT-Test" basedir=".." default="test.full" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="XLT-Test" basedir=".." default="test.full" xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
     <property file="build.properties" />
 
@@ -53,23 +53,32 @@
         <condition property="classpath.set">
             <and>
                 <isreference refid="classpath" />
-                <isreference refid="maven-ant-tasks.classpath" />
+                <isreference refid="maven-resolver-ant-tasks.classpath" />
                 <isset property="build.doc.dir" />
             </and>
         </condition>
 
         <fail unless="classpath.set" message="This project cannot be run stand-alone." />
 
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+        <typedef resource="org/apache/maven/resolver/ant/antlib.xml" uri="antlib:org.apache.maven.resolver.ant" classpathref="maven-resolver-ant-tasks.classpath" />
 
-        <artifact:dependencies scopes="test" filesetId="test.fileset">
-            <pom file="${basedir}/pom.xml" />
-        </artifact:dependencies>
+        <!-- redefine default Maven repo to be used with https -->
+        <resolver:remoterepos id="resolver.repositories.test">
+            <resolver:remoterepo url="https://repo1.maven.org/maven2/" />
+        </resolver:remoterepos>
+
+        <resolver:pom id="xlt.pom" file="pom.xml" />
+
+        <resolver:dependencies id="depsFromPom" pomRef="xlt.pom" />
+
+        <resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories.test">
+            <files refid="test.fileset" scopes="test" />
+        </resolver:resolve>
 
         <path id="test.classpath">
             <pathelement location="${test.classes.dir}" />
             <pathelement location="${test-hu.classes.dir}" />
-            <fileset refid="test.fileset" />
+            <resources refid="test.fileset" />
             <path refid="classpath" />
         </path>
 
@@ -191,7 +200,7 @@
                 <include name="**/*.class" />
                 <exclude name="**/test/**/*.class" />
                 <exclude name="**/*Test.class" />
-                <exclude name="com/xceptance/xlt/license/**/*.class"/>
+                <exclude name="com/xceptance/xlt/license/**/*.class" />
                 <exclude name="com/gargoylesoftware/**/*.class" />
                 <exclude name="org/openqa/selenium/**/*.class" />
                 <exclude name="org/pegdown/**/*.class" />
@@ -257,7 +266,7 @@
         </checkstyle>
 
         <!-- final transformation of checkstyle report -->
-        <xslt classpathref="classpath" in="${reports.checkstyle.xml}/checkstyle_report.xml" out="${reports.checkstyle.html}/checkstyle_report.html" style="${styles.dir}/checkstyle-noframes.xsl"/>
+        <xslt classpathref="classpath" in="${reports.checkstyle.xml}/checkstyle_report.xml" out="${reports.checkstyle.html}/checkstyle_report.html" style="${styles.dir}/checkstyle-noframes.xsl" />
     </target>
 
     <!-- Analytics target -->

diff --git a/build.xml b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="XLT" default="all" basedir="." xmlns:xceptance="antlib:com.xceptance.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="XLT" default="all" basedir="." xmlns:xceptance="antlib:com.xceptance.ant" xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
     <property file="build.properties" />
     <property environment="env" />
@@ -42,8 +42,8 @@
     </scriptdef>
 
     <target name="init.mvn" unless="init.mvn.run">
-        <path id="maven-ant-tasks.classpath" path="${lib-build.dir}/maven-ant-tasks-2.1.3.jar" />
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+        <path id="maven-resolver-ant-tasks.classpath" path="${lib-build.dir}/maven-resolver-ant-tasks-1.2.0-uber.jar" />
+        <typedef resource="org/apache/maven/resolver/ant/antlib.xml" uri="antlib:org.apache.maven.resolver.ant" classpathref="maven-resolver-ant-tasks.classpath" />
 
         <dependset>
             <srcfilelist dir="${basedir}">
@@ -55,24 +55,27 @@
             </targetfileset>
         </dependset>
 
-        <artifact:pom id="xlt.pom" file="pom.xml" inheritAllProperties="false" />
+        <resolver:pom id="xlt.pom" file="pom.xml" />
 
         <property name="version" value="${xlt.pom.version}" />
         <property name="bin.dist.name" value="${project.name}-${version}" />
         <property name="jar.name" value="${project.name}-${version}.jar" />
-
+        <property name="sourcejar.name" value="${project.name}-${version}-sources.jar" />
 
         <!-- Name for the generated API documentation file without the file extension -->
         <property name="api.doc.file.name" value="${project.name}-${version}-javadoc" />
 
+        <!-- redefine default Maven repo to be used with https -->
+        <resolver:remoterepos id="resolver.repositories">
+            <resolver:remoterepo url="https://repo1.maven.org/maven2/" />
+        </resolver:remoterepos>
 
-        <artifact:dependencies cacheDependencyRefs="true" scopes="compile" filesetId="deps.fileset" type="jar">
-            <pom refid="xlt.pom" />
-        </artifact:dependencies>
-        <artifact:dependencies scopes="provided" filesetId="provided.fileset">
-            <pom refid="xlt.pom" />
-        </artifact:dependencies>
+        <resolver:dependencies id="depsFromPom" pomRef="xlt.pom" />
 
+        <resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories">
+            <files refid="deps.fileset" scopes="compile" />
+            <files refid="provided.fileset" scopes="compile,provided" />
+        </resolver:resolve>
 
         <condition property="need.copy.deps">
             <or>
@@ -96,8 +99,8 @@
         <!-- the global classpath -->
         <path id="classpath">
             <pathelement path="${classes.dir}" />
-            <fileset refid="deps.fileset" />
-            <fileset refid="provided.fileset" />
+            <resources refid="deps.fileset" />
+            <resources refid="provided.fileset" />
             <fileset dir="${lib-build.dir}">
                 <include name="*.jar" />
             </fileset>
@@ -147,7 +150,7 @@
         <mkdir dir="${lib.dir}" />
 
         <copy todir="${lib.dir}">
-            <fileset refid="deps.fileset" />
+            <resources refid="deps.fileset" />
             <mapper type="flatten" />
         </copy>
 
@@ -217,6 +220,14 @@
         </jar>
     </target>
 
+    <!-- Builds a JAR file from the sources. -->
+    <target name="sourcejar" depends="init" description="Generates .jar file from the sources.">
+        <jar jarfile="${build.dir}/${sourcejar.name}">
+            <zipfileset dir="${src.dir}/main/java" />
+            <zipfileset dir="${src.dir}/main/resources" />
+        </jar>
+    </target>
+
     <!-- Documentation -->
     <target name="apidoc">
         <antcall target="doc" inheritrefs="true">
@@ -310,8 +321,8 @@
             </zipfileset>
         </zip>
         <jar destfile="${build.doc.dir}/${api.doc.file.name}.jar" basedir="${build.doc.dir}/apidoc/" />
-        <zip zipfile="${dist.dir}/${bin.dist.name}.zip">
 
+        <zip zipfile="${dist.dir}/${bin.dist.name}.zip">
             <zipfileset dir="${basedir}" prefix="${bin.dist.name}">
                 <include name="bin/**" />
                 <exclude name="bin/**/*.sh" />
@@ -398,21 +409,21 @@
         <antcall target="release.task" inheritrefs="true" />
     </target>
 
-    <target name="release.task" depends="clean, dist, sigtest, fulltest">
+    <target name="release.task" depends="clean, sourcejar, dist, sigtest, fulltest">
         <mkdir dir="${release.dir}" />
 
         <copy todir="${release.dir}">
+            <fileset dir="${basedir}" includes="pom.xml" />
             <fileset dir="${dist.dir}" includes="*.zip *.sha256" />
             <fileset dir="${build.tools.dir}" includes="*.xpi update.rdf" />
             <fileset dir="${build.doc.dir}" includes="${api.doc.file.name}.???" />
             <fileset file="${build.dir}/${jar.name}" />
+            <fileset file="${build.dir}/${sourcejar.name}" />
         </copy>
         <zip destfile="${release.dir}/xltdocs.zip">
             <zipfileset dir="${build.doc.dir}/xlt" includes="**/*" />
         </zip>
 
-        <antcall target="writepom" inheritrefs="true" />
-
     </target>
 
     <!-- Downloads the EC2 on-demand instance information as JS file from AWS. -->
@@ -459,7 +470,6 @@
         </antcall>
     </target>
 
-
     <!--
         =====================================
         = API signature check and creation. =
@@ -478,7 +488,6 @@
         </antcall>
     </target>
 
-
     <!--
         ==================
         = Generic tasks. =
@@ -499,7 +508,7 @@
     <target name="test" depends="compile">
         <ant antfile="${test.build.file}" target="test.${action}" inheritall="false" inheritrefs="false">
             <reference refid="classpath" />
-            <reference refid="maven-ant-tasks.classpath" />
+            <reference refid="maven-resolver-ant-tasks.classpath" />
             <propertyset>
                 <propertyref name="build.doc.dir" />
             </propertyset>
@@ -516,32 +525,6 @@
         </ant>
     </target>
 
-    <!--
-        ==================================
-        = POM generation and deployment. =
-        ==================================
-    -->
-
-    <target name="check.pom.file" depends="init">
-        <dependset>
-            <srcfileset dir="${basedir}">
-                <include name="pom.xml" />
-            </srcfileset>
-            <targetfileset dir="${release.dir}">
-                <include name="pom.xml" />
-            </targetfileset>
-        </dependset>
-
-        <condition property="pom.exists">
-            <available file="${release.dir}/pom.xml" type="file" />
-        </condition>
-    </target>
-
-    <target name="writepom" unless="pom.exists" depends="check.pom.file">
-        <mkdir dir="${release.dir}" />
-        <artifact:writepom pomRefId="xlt.pom" file="${release.dir}/pom.xml" />
-    </target>
-
     <!--
         ==================================
         = Timer-recorder extension.      =

diff --git a/doc/xltdoc/release-notes/5.0.x.textile b/doc/xltdoc/release-notes/5.0.x.textile
@@ -5,6 +5,33 @@ position: 984
 sorted: true
 ---
 
+h2. XLT 5.0.1
+
+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@:
+
+bc(plain).. 
+<!-- Xceptance repo no longer needed. -->
+<!--     <repositories> -->
+<!--         <repository> -->
+<!--             <id>xc-nexus</id> -->
+<!--             <url>https://lab.xceptance.de/nexus/content/groups/public</url> -->
+<!--         </repository> -->
+<!--     </repositories> -->
+
+<dependencies>
+	<dependency>
+		<groupId>com.xceptance</groupId>
+		<artifactId>xlt</artifactId>
+		<version>5.0.1</version>
+	</dependency>
+</dependencies>
+
+p. Furthermore, this release fixes an @ArrayIndexOutOfBoundsException@ thrown sporadically by HtmlUnit's HTML parser.
+
+p. See "here":https://github.com/Xceptance/XLT/milestone/2 for the complete list of improvements and fixes.
+
+
+
 h2. XLT 5.0.0
 
 h3. XLT Goes Open Source

diff --git a/lib-build/maven-ant-tasks-2.1.3.jar b/lib-build/maven-ant-tasks-2.1.3.jar
diff --git a/lib-build/maven-resolver-ant-tasks-1.2.0-uber.jar b/lib-build/maven-resolver-ant-tasks-1.2.0-uber.jar