From 5da955f5e8664baea3c3c98a218e1678a4222ea7 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Wed, 28 Jan 2015 10:40:43 +0100
Subject: [PATCH] added dependency infos for other tools; typos; minor changes
---
src/changes/changes.xml | 2 +-
src/site/markdown/dependencies.markdown | 45 +++++++++++++++++++
src/site/markdown/download.markdown | 9 ++--
src/site/markdown/wiki | 2 +-
src/site/site.xml | 8 +---
.../framework/RunnableConsumerStageTest.java | 1 +
6 files changed, 55 insertions(+), 12 deletions(-)
create mode 100644 src/site/markdown/dependencies.markdown
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7ca35aac..0b48e4b2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
<properties>
- <title>Release notes</title>
+ <title>Release Notes</title>
</properties>
<body>
<release version="Snapshot" date="Daily basis" description="Unstable preview of oncoming versions">
diff --git a/src/site/markdown/dependencies.markdown b/src/site/markdown/dependencies.markdown
new file mode 100644
index 00000000..e68ccd66
--- /dev/null
+++ b/src/site/markdown/dependencies.markdown
@@ -0,0 +1,45 @@
+# Dependency Information
+
+Please make sure you use Maven's central repository. Help on how to add it, can be found [here](http://central.sonatype.org/pages/consumers.html).
+
+### Apache Buildr
+
+```
+'net.sourceforge.teetime:teetime:jar:${teetime.stableversion}'
+```
+
+### Apache Ivy
+
+```
+<dependency org="net.sourceforge.teetime" name="teetime" rev="${teetime.stableversion}">
+ <artifact name="teetime" type="jar" />
+</dependency>
+```
+
+### Groovy Grape
+
+```
+@Grapes(
+@Grab(group='net.sourceforge.teetime', module='teetime', version='${teetime.stableversion}')
+)
+```
+
+### Grails
+
+```
+compile 'net.sourceforge.teetime:teetime:${teetime.stableversion}'
+```
+
+### Leiningen
+
+```
+[net.sourceforge.teetime/teetime "${teetime.stableversion}"]
+```
+
+### SBT
+
+```
+libraryDependencies += "net.sourceforge.teetime" % "teetime" % "${teetime.stableversion}"
+```
+
+
diff --git a/src/site/markdown/download.markdown b/src/site/markdown/download.markdown
index 8534053a..15a04471 100644
--- a/src/site/markdown/download.markdown
+++ b/src/site/markdown/download.markdown
@@ -1,6 +1,8 @@
# Download
-There are several ways to get TeeTime. Choose the best one for you.
+In order to work with TeeTime, you simply need to add the framework to your own project.
+
+TeeTime is distributed through a variety of channels to serve most needs.
## Latest stable
@@ -20,12 +22,11 @@ If you use Maven, simply add following lines to your ``pom.xml``:
</dependency>
```
-<!--- Dependency informations for other project management tools can be found [here](dependency-info.html). -->
-Please make sure, your project management tool uses Maven's central repository. Help on how to add it, can be found [here](http://central.sonatype.org/pages/consumers.html).
+For other project management tools, please check [here](dependencies.html).
#### Binaries and sources
-The latest TeeTime release can be downloaded directly from [Sourceforge](https://sourceforge.net/projects/teetime/files/latest/download). If you also want to download the source and/or JavaDoc, you can also get a summary of available files on [Sourceforge](https://sourceforge.net/projects/teetime/files/).
+The latest TeeTime release can be downloaded directly from [Sourceforge](https://sourceforge.net/projects/teetime/files/latest/download). If you also want to download the source and/or JavaDoc, you can also get a summary of available files on [Sourceforge](https://sourceforge.net/projects/teetime/files/) or [the Central Repository](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sourceforge.teetime%22%20AND%20a%3A%22teetime%22).
## Snapshot
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 0e447457..a9358190 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
+Subproject commit a93581905ef7b0584d52eae1898148ffa6201a31
diff --git a/src/site/site.xml b/src/site/site.xml
index bc475f0d..a56d4d41 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -55,6 +55,7 @@
</links>
<menu name="Documentation">
<item name="JavaDoc" href="apidocs/index.html" />
+ <item name="Release Notes" href="changes-report.html" />
<item name="Project Dependencies" href="dependencies.html" />
<item name="License" href="license.html" />
</menu>
@@ -70,7 +71,6 @@
<item name="News" href="news.html" />
<item name="Download" href="download.html" />
<item name="Wiki" href="wiki/" />
- <item name="Release notes" href="changes-report.html" />
</menu>
<!-- <menu ref="modules"/> -->
<!-- <menu ref="reports"/> -->
@@ -101,7 +101,7 @@
<titleTemplate>%2$s | %1$s</titleTemplate>
<bottomNav maxSpan="9">
<column>Main</column>
- <column>Wiki|Documentation</column>
+ <column>Documentation</column>
<column>Get Involved</column>
</bottomNav>
<bottomDescription>
@@ -139,10 +139,6 @@
<toc>top</toc>
<tocTopMax>4</tocTopMax>
</download>
- <dependencies>
- <toc>top</toc>
- <tocTopMax>5</tocTopMax>
- </dependencies>
<contribute>
<highlightJs>false</highlightJs>
</contribute>
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTest.java b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
index 02335317..474200fc 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTest.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
@@ -8,6 +8,7 @@ import java.util.Collection;
import org.junit.Test;
import teetime.util.Pair;
+import teetime.framework.WaitStrategyConfiguration;
import com.google.common.base.Joiner;
--
GitLab