Changing SCM URLs for gitbox and adding minor changes
- Info about web tests
- Added github ribbon
- Modified the ohloh ribbon
diff --git a/pom.xml b/pom.xml
index 645e485..edb7074 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,8 +156,8 @@
</reportSet>
</reportSets>
<configuration>
- <anonymousConnection>scm:git:https://git-wip-us.apache.org/repos/asf/archiva.git</anonymousConnection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/archiva.git</developerConnection>
+ <anonymousConnection>scm:git:https://github.com/apache/archiva.git</anonymousConnection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/archiva.git</developerConnection>
<webAccessUrl>https://github.com/apache/archiva</webAccessUrl>
</configuration>
</plugin>
diff --git a/src/site/apt/developers/building.apt b/src/site/apt/developers/building.apt
index 70a8a21..5dcdb78 100644
--- a/src/site/apt/developers/building.apt
+++ b/src/site/apt/developers/building.apt
@@ -48,34 +48,12 @@
Merging Github Pull requests
- When somebody creats a pull request for archiva on github an email is sent to the developer list.
+ When somebody creates a pull request for archiva on github an email is sent to the developer list.
First review the changes and check for style and impact of the changes. And check the build on the jenkins
server for this pull request (archiva-master-build-pr-builder).
- If you have not added the github repository to your git config do the following:
-
-+--
-git remote add github https://github.com/apache/archiva.git
-+--
-
- When review and jenkins build are OK, then checkout the pull request branch:
-
-+--
-ID=30 # Set this to the number of the pull request
-git fetch github pull/${ID}/head:pr-${ID}
-git checkout pr-${ID}
-mvn clean install
-+--
-
- And merge into the master. If a JIRA ticket is opened for this, add the ticket number to the commit message.
-
-+--
-git checkout master
-git merge pr-${ID}
-mvn clean install
-git push # If all is going fine
-+--
+ We have moved to gitbox, so merging the PR should be done on the github web site by using the PR merge features.
Documentation
@@ -109,3 +87,20 @@
Hit your browser: {{http://localhost:9091/archiva/index.html}}
+Running the selenium tests (Web UI tests) locally
+
+ The selenium tests use docker containers for the selenium and browser installation. To run the tests locally you should have docker installed on
+ your developer machine.
+ The docker container can be built locally or pulled from the apachearchiva Dockerhub repository.
+ To start the docker container, run the following script:
+
++--
+ ./src/ci/scripts/container_webtest.sh start
++--
+
+ The UI tests can be run with:
+
++--
+mvn clean install -DmaxWaitTimeInMs=2000 -DseleniumRemote=true -Pci-server -Pit-js -Pchrome -pl :archiva-webapp-test
++--
+
diff --git a/src/site/apt/developers/publishing-site.apt b/src/site/apt/developers/publishing-site.apt
index 7b229f5..b5438ad 100644
--- a/src/site/apt/developers/publishing-site.apt
+++ b/src/site/apt/developers/publishing-site.apt
@@ -34,7 +34,7 @@
The site displayed at the root of {{http://archiva.apache.org}} (where
you are reading this) has its source code in Git at
- {{https://git-wip-us.apache.org/repos/asf/archiva-site.git}}.
+ {{https://gitbox.apache.org/repos/asf/archiva-site.git}}.
To edit and publish the site, do the following:
@@ -69,7 +69,7 @@
The documentation displayed under the subdirectories of
{{http://archiva.apache.org/docs/}} has its source code in Git at
- {{https://git-wip-us.apache.org/repos/asf/archiva.git}} directory archiva-docs, which
+ {{https://gitbox.apache.org/repos/asf/archiva.git}} directory archiva-docs, which
is part of the main project checkout.
The instructions for managing the documentation is the same as for the main
diff --git a/src/site/site.xml b/src/site/site.xml
index f979eb8..7a86387 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -45,8 +45,13 @@
</twitter-->
<ohloh>
<projectId>6670</projectId>
- <widget>stats</widget>
+ <widget>thin-badge</widget>
</ohloh>
+ <gitHub>
+ <projectId>apache/archiva</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>gray</ribbonColor>
+ </gitHub>
<!--gitHub>
<projectId>apache/archiva</projectId>
<ribbonOrientation>right</ribbonOrientation>
@@ -111,8 +116,13 @@
<footer>
<![CDATA[
<div class="row pull-left">Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.</div>
- <div class="row pull-left">
+ <div class="row">
+
+ </div>
+ <div class="row">
+ <p>
<a href="${project.url}privacy-policy.html">Privacy Policy</a>
+ </p>
</div>
]]>
</footer>
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index ada1a46..3c24a75 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -106,9 +106,10 @@
<thead>
<tr>
<th>Archiva ${archivaReleaseVersion} </th>
- <th>Mirrors</th>
+ <th>File-Type</th>
<th>MD5 Checksum</th>
<th>SHA1 Checksum</th>
+ <th>SHA256 Checksum</th>
<th>Signature</th>
</tr>
</thead>
@@ -118,6 +119,7 @@
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz">tar.gz</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.md5">md5</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.sha1">sha1</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.sha256">sha256</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.asc">asc</a></td>
</tr>
<tr>
@@ -125,6 +127,7 @@
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip">zip</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.md5">md5</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.sha1">sha1</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.sha256">sha256</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.asc">asc</a></td>
</tr>
<tr>
@@ -132,6 +135,7 @@
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war">war</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.md5">md5</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.sha1">sha1</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.sha256">sha256</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.asc">asc</a></td>
</tr>
<tr>
@@ -139,6 +143,7 @@
<td><a href="[preferred]archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip">source zip</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.md5">md5</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.sha1">sha1</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.sha256">sha256</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.asc">asc</a></td>
</tr>
</tbody>
@@ -207,7 +212,7 @@
</subsection>
<subsection name="Verify the integrity of the files">
<p>
- We recommend that you verify the integrity of the downloaded files using the PGP signatures and MD5 checksums.
+ We recommend that you verify the integrity of the downloaded files using the PGP signatures and SHA, MD5 checksums.
The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/archiva/KEYS">KEYS</a>
as well as the asc signature file for the particular distribution. Make sure you get these files from
@@ -226,10 +231,10 @@
% gpg --verify $filename.tar.gz.asc
</pre>
<p>
- You can also verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many
+ Please use the SHA checksum for verification if available, use MD5 only for the older versions, that have no SHA checksum available.
+ To verify the SHA signature on the files, you can use utilities for your platform. A Unix program called sha1sum or sha256sum (md5sum) is included in many
Unix distributions. It is also available as part of <a href="http://www.gnu.org/software/coreutils/">GNU Coreutils</a>.
- Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">Fourmilab</a>,
- <a href="http://www.pc-tools.net/win32/md5sums">PC-Tools</a> or <a href="http://www.slavasoft.com/fsum/">SlavaSoft</a>
+ Windows users can get binary checksum utility e.g. from <a href="http://www.slavasoft.com/hashcalc/">SlavaSoft</a>.
</p>
</subsection>
</section>
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
index cc89113..89f97ff 100644
--- a/src/site/xdoc/index.xml.vm
+++ b/src/site/xdoc/index.xml.vm
@@ -325,7 +325,7 @@
<table>
<tr>
<th> </th>
- <th>Mirrors</th>
+ <th>File-Type</th>
<th>Checksum</th>
<th>Signature</th>
</tr>
