Skip to content

Commit

Permalink
Update Maven skin and site plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@jodastephen
jodastephen committed Sep 28, 2018
1 parent b8ec80e commit 88389db
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 67 deletions.
79 changes: 23 additions & 56 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,50 +519,6 @@
</excludes>
</configuration>
</plugin>
<!-- Setup site with reflow maven skin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
<dependencies>
<dependency>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
</dependencies>
</plugin>
<!-- Setup to deploy site to GitHub, invoked with mvn site-deploy -->
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<executions>
<execution>
<id>github-site</id>
<goals>
<goal>site</goal>
</goals>
<phase>site-deploy</phase>
</execution>
</executions>
<configuration>
<message>Create website for ${project.artifactId} v${project.version}</message>
<path>${project.artifactId}</path>
<merge>true</merge>
<server>github</server>
<repositoryOwner>JodaOrg</repositoryOwner>
<repositoryName>jodaorg.github.io</repositoryName>
<branch>refs/heads/master</branch>
</configuration>
</plugin>
<!-- Compatibility check -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -669,11 +625,6 @@
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -711,6 +662,22 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
<!-- Setup site with reflow maven skin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
<dependencies>
<dependency>
<groupId>org.joda.external</groupId>
<artifactId>reflow-velocity-tools</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down Expand Up @@ -766,15 +733,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-plugin.version}</version>
<version>${maven-project-info-reports-plugin.version}</version>
<reportSets>
<reportSet>
<reports>
<report>ci-management</report>
<report>dependencies</report>
<report>dependency-info</report>
<report>issue-tracking</report>
<report>license</report>
<report>project-team</report>
<report>issue-management</report>
<report>licenses</report>
<report>team</report>
<report>scm</report>
<report>summary</report>
</reports>
Expand Down Expand Up @@ -1011,12 +979,11 @@
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
<maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-repository-plugin.version>2.4</maven-repository-plugin.version>
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
<!-- v3.6 doesn't work with theme -->
<maven-site-plugin.version>3.4</maven-site-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-surefire-report-plugin.version>2.21.0</maven-surefire-report-plugin.version>
<maven-toolchains-plugin.version>1.1</maven-toolchains-plugin.version>
Expand Down
13 changes: 8 additions & 5 deletions src/site/markdown/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Joda-Time provides a quality replacement for the Java date and time classes.
Joda-Time is the *de facto* standard date and time library for Java prior to Java SE 8.
Users are now asked to migrate to `java.time` (JSR-310).

Joda-Time is licensed under the business-friendly [Apache 2.0 licence](license.html).
Joda-Time is licensed under the business-friendly [Apache 2.0 licence](licenses.html).


## <i></i> Features
Expand Down Expand Up @@ -60,17 +60,20 @@ public boolean isAfterPayDay(<a href="apidocs/org/joda/time/DateTime.html"><b>Da
}
return datetime.getDayOfMonth() > 28;
}

</pre>
<pre>
public <a href="apidocs/org/joda/time/Days.html"><b>Days</b></a> daysToNewYear(<a href="apidocs/org/joda/time/LocalDate.html"><b>LocalDate</b></a> fromDate) {
<a href="apidocs/org/joda/time/LocalDate.html"><b>LocalDate</b></a> newYear = fromDate.plusYears(1).withDayOfYear(1);
return <a href="apidocs/org/joda/time/Days.html"><b>Days</b></a>.daysBetween(fromDate, newYear);
}

</pre>
<pre>
public boolean isRentalOverdue(<a href="apidocs/org/joda/time/DateTime.html"><b>DateTime</b></a> datetimeRented) {
<a href="apidocs/org/joda/time/Period.html"><b>Period</b></a> rentalPeriod = new <a href="apidocs/org/joda/time/Period.html"><b>Period</b></a>().withDays(2).withHours(12);
return datetimeRented.plus(rentalPeriod).isBeforeNow();
}

</pre>
<pre>
public String getBirthMonthText(<a href="apidocs/org/joda/time/LocalDate.html"><b>LocalDate</b></a> dateOfBirth) {
return dateOfBirth.monthOfYear().getAsText(Locale.ENGLISH);
}
Expand Down Expand Up @@ -121,7 +124,7 @@ The library has been under active development since 2002.
It is a mature and reliable code base.
A number of <a href="related.html">related projects</a> are now available.
* <b>Open Source</b>.
Joda-Time is licenced under the business friendly <a href="license.html">Apache License Version 2.0</a>.
Joda-Time is licenced under the business friendly <a href="licenses.html">Apache License Version 2.0</a>.

---

Expand Down
13 changes: 7 additions & 6 deletions src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<googleAnalyticsAccountId>UA-1425975-4</googleAnalyticsAccountId>

<skin>
<groupId>lt.velykis.maven.skins</groupId>
<groupId>org.joda.external</groupId>
<artifactId>reflow-maven-skin</artifactId>
<version>1.1.1</version>
<version>1.2</version>
</skin>

<custom>
Expand Down Expand Up @@ -79,8 +79,9 @@

<body>
<head>
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css" rel="stylesheet"/>
<link rel="author" href="https://plus.google.com/113137868744510231215"/>
<![CDATA[
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css" rel="stylesheet"/>
<link rel="author" href="https://plus.google.com/113137868744510231215"/>]]>
</head>

<menu name="Documentation">
Expand Down Expand Up @@ -109,7 +110,7 @@
</item>
<item name="FAQ" href="faq.html"/>
<item name="Javadoc" href="apidocs/index.html"/>
<item name="License" href="license.html"/>
<item name="License" href="licenses.html"/>
</menu>

<menu name="Information">
Expand All @@ -119,7 +120,7 @@
<item name="FAQ" href="faq.html"/>
<item name="Related projects" href="related.html"/>
<item name="Javadoc" href="apidocs/index.html"/>
<item name="License" href="license.html"/>
<item name="License" href="licenses.html"/>
<item name="Key concepts" href="key.html"/>
<item name="Chronologies" href="cal.html"/>
</menu>
Expand Down

0 comments on commit 88389db

Please sign in to comment.