Skip to content

Commit 22ffa6e

Browse files
committed
o First step for setting up a documentation structure. o This setup uses Maven site generation with support for asciidoctor / markdown.
1 parent 8cec2bd commit 22ffa6e

7 files changed

Lines changed: 64 additions & 115 deletions

File tree

pom.xml

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<version>9</version>
1818
</parent>
1919

20-
<name>Jenkins Client</name>
20+
<name>Jenkins API client for Java</name>
2121
<url>http://github.com/RisingOak/jenkins-client</url>
2222
<description>A Jenkins API client for Java</description>
2323

@@ -48,6 +48,8 @@
4848
<maven.compiler.source>1.7</maven.compiler.source>
4949
<maven.compiler.target>1.7</maven.compiler.target>
5050

51+
<asciidoctor-maven-plugin.version>1.5.3</asciidoctor-maven-plugin.version>
52+
5153
<!-- Version of Jenkins to use for Integration Tests -->
5254
<jenkins-version>1.644</jenkins-version>
5355
<junit.version>4.11</junit.version>
@@ -197,7 +199,7 @@
197199
<plugin>
198200
<groupId>org.apache.maven.plugins</groupId>
199201
<artifactId>maven-source-plugin</artifactId>
200-
<version>2.4</version>
202+
<version>3.0.0</version>
201203
<executions>
202204
<!--
203205
! here we override the super-pom attach-sources execution id which
@@ -241,7 +243,7 @@
241243
<plugin>
242244
<groupId>org.apache.maven.plugins</groupId>
243245
<artifactId>maven-compiler-plugin</artifactId>
244-
<version>3.3</version>
246+
<version>3.5.1</version>
245247
</plugin>
246248
<!--
247249
! We define a newer version than in parent.
@@ -279,9 +281,45 @@
279281
<scmBranch>gh-pages</scmBranch>
280282
</configuration>
281283
</plugin>
284+
<plugin>
285+
<groupId>org.asciidoctor</groupId>
286+
<artifactId>asciidoctor-maven-plugin</artifactId>
287+
<version>${asciidoctor-maven-plugin.version}</version>
288+
</plugin>
282289
</plugins>
283290
</pluginManagement>
284291
<plugins>
292+
<plugin>
293+
<groupId>org.apache.maven.plugins</groupId>
294+
<artifactId>maven-site-plugin</artifactId>
295+
<version>3.4</version>
296+
<dependencies>
297+
<dependency>
298+
<groupId>org.apache.maven.doxia</groupId>
299+
<artifactId>doxia-module-markdown</artifactId>
300+
<version>1.6</version>
301+
</dependency>
302+
<dependency>
303+
<groupId>org.asciidoctor</groupId>
304+
<artifactId>asciidoctor-maven-plugin</artifactId>
305+
<version>${asciidoctor-maven-plugin.version}</version>
306+
</dependency>
307+
</dependencies>
308+
<configuration>
309+
<asciidoc>
310+
<!-- optional site-wide AsciiDoc attributes -->
311+
<attributes>
312+
<icons>font</icons>
313+
<source-highlighter>coderay</source-highlighter>
314+
<coderay-css>style</coderay-css>
315+
<toclevels>2</toclevels>
316+
<project-version>${project.version}</project-version>
317+
<sectnums>true</sectnums>
318+
<preserveDirectories>true</preserveDirectories>
319+
</attributes>
320+
</asciidoc>
321+
</configuration>
322+
</plugin>
285323
<plugin>
286324
<groupId>org.apache.maven.plugins</groupId>
287325
<artifactId>maven-shade-plugin</artifactId>
@@ -332,6 +370,7 @@
332370
<artifactId>maven-project-info-reports-plugin</artifactId>
333371
<version>2.8</version>
334372
</plugin>
373+
<!--
335374
<plugin>
336375
<groupId>org.apache.maven.plugins</groupId>
337376
<artifactId>maven-pmd-plugin</artifactId>
@@ -355,6 +394,7 @@
355394
<artifactId>maven-jxr-plugin</artifactId>
356395
<version>2.5</version>
357396
</plugin>
397+
-->
358398
</plugins>
359399
</reporting>
360400

src/main`java/com/offbytwo/jenkins/client/util/RequestReleasingInputStream.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/main`java/com/offbytwo/jenkins/model/Artifact.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/site/asciidoc/index.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
:revnumber: ${project-version}
2+
3+
== Overview ==
4+
5+
Here you can see the first page.
6+
This is the first.
7+

src/site/asciidoc/sub/sub.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Test

src/site/markdown/upgrade.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Overview ##
2+
3+
Document in markdown. Here you can write documentation
4+
with structure [with links][link]
5+
6+
7+
[link]: http://www.jenkins-ci.org
8+

src/site/site.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<skin>
88
<groupId>org.apache.maven.skins</groupId>
99
<artifactId>maven-fluido-skin</artifactId>
10-
<version>1.4</version>
10+
<version>1.5</version>
1111
</skin>
1212

1313
<custom>
@@ -27,6 +27,10 @@
2727
<body>
2828
<menu name="Overview">
2929
<item name="Introduction" href="index.html"/>
30+
<item name="Upgrade" href="upgrade.html"/>
31+
</menu>
32+
<menu name="Sub">
33+
<item name="Sub" href="sub/sub.html"/>
3034
</menu>
3135
<menu ref="reports" />
3236
</body>

0 commit comments

Comments
 (0)