You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/29 21:38:35 UTC
[jspwiki-site] 01/02: Several tasks on site generation
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 76e725c9b457b011f5670dc9b1e581c515ecbbf9
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Thu Nov 29 20:50:49 2018 +0100
Several tasks on site generation
* JDK / maven versions required updated to 1.8 and 3.5.0, to follow up with main build
* fix binary compatibility report (was looking for classes on org.apache.jspwiki package..)
* prepare for upcoming 2.11.0.M1 release
* updated freemarker to 2.3.27-incubating
---
pom.xml | 47 +++++++++++++++++++++++++++++++++++------------
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index deba97a..28f2642 100755
--- a/pom.xml
+++ b/pom.xml
@@ -40,14 +40,15 @@
<plugin.enforcer>1.4.1</plugin.enforcer>
<plugin.resources>3.1.0</plugin.resources>
<plugin.japicmp.version>0.13.0</plugin.japicmp.version>
- <plugin.japicmp.jspwiki-new>2.10.5</plugin.japicmp.jspwiki-new>
- <plugin.japicmp.jspwiki-old>2.10.0</plugin.japicmp.jspwiki-old>
+ <plugin.japicmp.jspwiki-new>2.11.0.M1-SNAPSHOT</plugin.japicmp.jspwiki-new>
+ <plugin.japicmp.jspwiki-old>2.10.5</plugin.japicmp.jspwiki-old>
<plugin.jbake>0.0.9</plugin.jbake>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <version.freemarker>2.3.26-incubating</version.freemarker>
+ <version.freemarker>2.3.27-incubating</version.freemarker>
<version.jbake-core>2.5.1</version.jbake-core>
- <version.jdk>1.7</version.jdk>
+ <version.jdk>1.8</version.jdk>
+ <version.maven>3.5.0</version.maven>
<version.pegdown>1.6.0</version.pegdown>
</properties>
@@ -135,6 +136,29 @@
</artifactItems>
</configuration>
</execution>
+ <!-- <execution>
+ <id>unpack-apidocs-2.11</id>
+ <phase>generate-resources</phase>
+ <goals><goal>unpack</goal></goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-main</artifactId>
+ <version>2.11.0.M1</version>
+ <classifier>javadoc</classifier>
+ <outputDirectory>${jbake.dest}/apidocs/main/2.11.0.M1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-markdown</artifactId>
+ <version>2.11.0.M1</version>
+ <classifier>javadoc</classifier>
+ <outputDirectory>${jbake.dest}/apidocs/markdown/2.11.0.M1</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution> -->
</executions>
</plugin>
@@ -171,8 +195,8 @@
<version>${version.jdk}</version>
</requireJavaVersion>
<requireMavenVersion>
- <message>JBAKE REQUIRES MAVEN AT LEAST MAVEN 3.1.1</message>
- <version>[3.1.1,)</version>
+ <message>JBAKE REQUIRES MAVEN AT LEAST MAVEN ${version.maven}</message>
+ <version>[version.maven,)</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -217,9 +241,9 @@
<version>${plugin.japicmp.version}</version>
<configuration>
<parameter>
- <!-- <ignoreMissingClasses>true</ignoreMissingClasses> -->
+ <ignoreMissingClasses>true</ignoreMissingClasses>
<includes>
- <include>org.apache.jspwiki</include>
+ <include>org.apache.wiki</include>
</includes>
<skipXmlReport>true</skipXmlReport>
</parameter>
@@ -230,12 +254,12 @@
<phase>generate-resources</phase>
<goals><goal>cmp</goal></goals>
<configuration>
- <htmlTitle>Binary compatibility between jspwiki-markdown ${plugin.japicmp.jspwiki-new} and 2.10.3</htmlTitle>
+ <htmlTitle>Binary compatibility between jspwiki-markdown ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-markdown</artifactId>
- <version>2.10.3</version>
+ <version>${plugin.japicmp.jspwiki-old}</version>
<type>jar</type>
</dependency>
</oldVersion>
@@ -267,10 +291,9 @@
<newVersion>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-war</artifactId>
+ <artifactId>jspwiki-main</artifactId>
<version>${plugin.japicmp.jspwiki-new}</version>
<type>jar</type>
- <classifier>classes</classifier>
</dependency>
</newVersion>
</configuration>