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/09/14 21:24:25 UTC
[jspwiki-site] branch jbake updated (880e296 -> ccdbefa)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git.
from 880e296 update site with 2.10.5 release info
new 253180f JSPWIKI-220: binary compatibility report
new ad43077 update plugins' versions
new e0e35ef spaces instead of tabs
new 4803ce1 update mvn build script
new 0626457 don't try to delete .
new ccdbefa JSPWIKI-220: add title for reports and by default don't ignore missing classes (it should be activated per execution, when needed
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
mvn-ci.sh | 4 +-
pom.xml | 111 +++++++++++++++++++--
.../jbake/assets/{apidocs => japicmp}/index.html | 26 ++---
3 files changed, 120 insertions(+), 21 deletions(-)
copy src/main/jbake/assets/{apidocs => japicmp}/index.html (50%)
mode change 100755 => 100644
[jspwiki-site] 06/06: JSPWIKI-220: add title for reports and by
default don't ignore missing classes (it should be activated per execution,
when needed
Posted by ju...@apache.org.
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 ccdbefa1f39105d31bb3bd18e703d22b1b4c1b98
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 21:12:47 2018 +0200
JSPWIKI-220: add title for reports and by default don't ignore missing classes (it should be activated per execution, when needed
---
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fecffac..0e6ba73 100755
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
<version>${plugin.japicmp.version}</version>
<configuration>
<parameter>
- <ignoreMissingClasses>true</ignoreMissingClasses>
+ <!-- <ignoreMissingClasses>true</ignoreMissingClasses> -->
<includes>
<include>org.apache.jspwiki</include>
</includes>
@@ -223,6 +223,7 @@
<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>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -246,6 +247,7 @@
<phase>generate-resources</phase>
<goals><goal>cmp</goal></goals>
<configuration>
+ <htmlTitle>Binary compatibility between jspwiki-main ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
[jspwiki-site] 04/06: update mvn build script
Posted by ju...@apache.org.
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 4803ce1fa07fd1969838450ddbdb8976cc4d83ae
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 19:10:40 2018 +0200
update mvn build script
---
mvn-ci.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mvn-ci.sh b/mvn-ci.sh
index 53dad29..0a801c8 100755
--- a/mvn-ci.sh
+++ b/mvn-ci.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-mvn clean generate-resources
+mvn clean process-resources
git checkout asf-site
git clean -f -d
git pull origin asf-site
[jspwiki-site] 05/06: don't try to delete .
Posted by ju...@apache.org.
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 0626457a58a744a284d170a28e7cb7a9e8212aaf
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 21:04:22 2018 +0200
don't try to delete .
---
mvn-ci.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mvn-ci.sh b/mvn-ci.sh
index 0a801c8..e100be5 100755
--- a/mvn-ci.sh
+++ b/mvn-ci.sh
@@ -4,7 +4,7 @@ mvn clean process-resources
git checkout asf-site
git clean -f -d
git pull origin asf-site
-find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
+find ./* -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
cp -rf target/content/* ./
rm -rf target
git add .
[jspwiki-site] 02/06: update plugins' versions
Posted by ju...@apache.org.
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 ad4307781a1852e7bc2480fb00ce7020f6879a9e
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 18:59:39 2018 +0200
update plugins' versions
---
pom.xml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7e8bbaf..274007d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
<properties>
<jbake.dest>${project.build.directory}/content</jbake.dest>
- <plugin.dependency>3.0.0</plugin.dependency>
- <plugin.enforcer>1.4</plugin.enforcer>
+ <plugin.dependency>3.1.1</plugin.dependency>
+ <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>
@@ -50,6 +50,7 @@
<version.jdk>1.7</version.jdk>
<version.pegdown>1.6.0</version.pegdown>
</properties>
+
<build>
<plugins>
<plugin>
@@ -179,9 +180,9 @@
</configuration>
<executions>
<execution>
- <id>generate-site</id>
- <phase>generate-resources</phase>
- <goals><goal>generate</goal></goals>
+ <id>generate-site</id>
+ <phase>generate-resources</phase>
+ <goals><goal>generate</goal></goals>
</execution>
</executions>
<dependencies>
@@ -209,6 +210,7 @@
<version>${plugin.japicmp.version}</version>
<configuration>
<parameter>
+ <ignoreMissingClasses>true</ignoreMissingClasses>
<includes>
<include>org.apache.jspwiki</include>
</includes>
[jspwiki-site] 01/06: JSPWIKI-220: binary compatibility report
Posted by ju...@apache.org.
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 253180f67420b05251504977b596a66e9a62bc4b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 18:59:08 2018 +0200
JSPWIKI-220: binary compatibility report
---
pom.xml | 103 +++++++++++++++++++++++++++++--
src/main/jbake/assets/japicmp/index.html | 14 +++++
2 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ea302b7..7e8bbaf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>21</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -38,6 +38,10 @@
<jbake.dest>${project.build.directory}/content</jbake.dest>
<plugin.dependency>3.0.0</plugin.dependency>
<plugin.enforcer>1.4</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.jbake>0.0.9</plugin.jbake>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -66,6 +70,11 @@
<plugin><!-- jbaking apidocs takes a looong time, for just copying some files, we better unpack them only when actually building the site -->
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ </plugin>
</plugins>
<pluginManagement>
@@ -121,6 +130,28 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${plugin.resources}</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/content/japicmp/${plugin.japicmp.jspwiki-new}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/japicmp</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${plugin.enforcer}</version>
@@ -148,9 +179,9 @@
</configuration>
<executions>
<execution>
- <id>generate-site</id>
- <phase>generate-resources</phase>
- <goals><goal>generate</goal></goals>
+ <id>generate-site</id>
+ <phase>generate-resources</phase>
+ <goals><goal>generate</goal></goals>
</execution>
</executions>
<dependencies>
@@ -171,6 +202,70 @@
</dependency>
</dependencies>
</plugin>
+
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>${plugin.japicmp.version}</version>
+ <configuration>
+ <parameter>
+ <includes>
+ <include>org.apache.jspwiki</include>
+ </includes>
+ <skipXmlReport>true</skipXmlReport>
+ </parameter>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cmp-jspwiki-markdown</id>
+ <phase>generate-resources</phase>
+ <goals><goal>cmp</goal></goals>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-markdown</artifactId>
+ <version>2.10.3</version>
+ <type>jar</type>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-markdown</artifactId>
+ <version>${plugin.japicmp.jspwiki-new}</version>
+ <type>jar</type>
+ </dependency>
+ </newVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>cmp-jspwiki-main</id>
+ <phase>generate-resources</phase>
+ <goals><goal>cmp</goal></goals>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-war</artifactId>
+ <version>${plugin.japicmp.jspwiki-old}</version>
+ <type>jar</type>
+ <classifier>classes</classifier>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-war</artifactId>
+ <version>${plugin.japicmp.jspwiki-new}</version>
+ <type>jar</type>
+ <classifier>classes</classifier>
+ </dependency>
+ </newVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/src/main/jbake/assets/japicmp/index.html b/src/main/jbake/assets/japicmp/index.html
new file mode 100644
index 0000000..269d9bc
--- /dev/null
+++ b/src/main/jbake/assets/japicmp/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+ <head>
+ <meta charset="UTF-8">
+ <meta http-equiv="refresh" content="1;url=http://jspwiki.apache.org/japicmp/2.10.5/">
+ <script type="text/javascript">
+ window.location.href = "http://jspwiki.apache.org/japicmp/2.10.5/"
+ </script>
+ <title>redirecting to latest compatibility reports</title>
+ </head>
+ <body>
+ If you are not redirected automatically, follow the link to <a href='http://jspwiki.apache.org/japicmp/2.10.5/'>latest compatibility reports</a>.
+ </body>
+</html>
\ No newline at end of file
[jspwiki-site] 03/06: spaces instead of tabs
Posted by ju...@apache.org.
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 e0e35ef4674966a1261bda784d13ff2b3fe3190f
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Sep 14 19:01:09 2018 +0200
spaces instead of tabs
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 274007d..fecffac 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
<plugin.dependency>3.1.1</plugin.dependency>
<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.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.jbake>0.0.9</plugin.jbake>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -131,7 +131,7 @@
</executions>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${plugin.resources}</version>
<executions>
@@ -210,7 +210,7 @@
<version>${plugin.japicmp.version}</version>
<configuration>
<parameter>
- <ignoreMissingClasses>true</ignoreMissingClasses>
+ <ignoreMissingClasses>true</ignoreMissingClasses>
<includes>
<include>org.apache.jspwiki</include>
</includes>