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 41627aac27d8d0736cd7cd5446ff3ff9c837fa50 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Mon Nov 22 14:42:23 2021 +0100 Update plugins' versions and configure japicmp so that it not fails if doesn't find an artifact --- pom.xml | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 206 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 987ff50..7b8c8b5 100755 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ <groupId>org.apache.jspwiki</groupId> <artifactId>jspwiki-site</artifactId> + <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> <name>Apache JSPWiki static site generator</name> <version>1.0.0-SNAPSHOT</version> @@ -36,15 +37,15 @@ <properties> <jbake.dest>${project.build.directory}/content</jbake.dest> - <plugin.enforcer>1.4.1</plugin.enforcer> - <plugin.resources>3.1.0</plugin.resources> - <plugin.japicmp.version>0.14.3</plugin.japicmp.version> - <plugin.japicmp.jspwiki-new>2.11.0.M7</plugin.japicmp.jspwiki-new> + <plugin.enforcer>3.0.0</plugin.enforcer> + <plugin.resources>3.2.0</plugin.resources> + <plugin.japicmp.version>0.15.4</plugin.japicmp.version> + <plugin.japicmp.jspwiki-new>2.11.0.M8</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.30</version.freemarker> + <version.freemarker>2.3.31</version.freemarker> <version.jbake-core>2.5.1</version.jbake-core> <version.jdk>1.8</version.jdk> <version.maven>3.5.0</version.maven> @@ -156,23 +157,27 @@ <configuration> <parameter> <ignoreMissingClasses>true</ignoreMissingClasses> + <ignoreNonResolvableArtifacts>true</ignoreNonResolvableArtifacts> <includes> <include>org.apache.wiki</include> </includes> + <skipPomModules>false</skipPomModules> <skipXmlReport>true</skipXmlReport> </parameter> </configuration> <executions> <execution> - <id>cmp-jspwiki-markdown</id> + <id>cmp-jspwiki-210-adapters</id> <phase>generate-resources</phase> <goals><goal>cmp</goal></goals> <configuration> - <htmlTitle>Binary compatibility between jspwiki-markdown ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-210-adapters ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> <oldVersion> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-markdown</artifactId> + <artifactId>jspwiki-210-adapters</artifactId> <version>${plugin.japicmp.jspwiki-old}</version> <type>jar</type> </dependency> @@ -180,7 +185,7 @@ <newVersion> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-markdown</artifactId> + <artifactId>jspwiki-210-adapters</artifactId> <version>${plugin.japicmp.jspwiki-new}</version> <type>jar</type> </dependency> @@ -188,11 +193,39 @@ </configuration> </execution> <execution> - <id>cmp-jspwiki-util</id> + <id>cmp-jspwiki-210-test-adaptees</id> <phase>generate-resources</phase> <goals><goal>cmp</goal></goals> <configuration> - <htmlTitle>Binary compatibility between jspwiki-util ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-210-test-adaptees ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <oldVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-210-test-adaptees</artifactId> + <version>${plugin.japicmp.jspwiki-old}</version> + <type>jar</type> + </dependency> + </oldVersion> + <newVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-210-test-adaptees</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> + <execution> + <id>cmp-jspwiki-api</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-api ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> <oldVersion> <dependency> <groupId>${project.groupId}</groupId> @@ -205,7 +238,86 @@ <newVersion> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-util</artifactId> + <artifactId>jspwiki-api</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> + <execution> + <id>cmp-jspwiki-bootstrap</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-bootstrap ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <oldVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-bootstrap</artifactId> + <version>${plugin.japicmp.jspwiki-old}</version> + <type>jar</type> + </dependency> + </oldVersion> + <newVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-bootstrap</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> + <execution> + <id>cmp-jspwiki-event</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-event ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <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-event</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> + <execution> + <id>cmp-jspwiki-kendra-search-provider</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-kendra-search-provider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <oldVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-kendra-search-provider</artifactId> + <version>${plugin.japicmp.jspwiki-old}</version> + <type>jar</type> + </dependency> + </oldVersion> + <newVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-kendra-search-provider</artifactId> <version>${plugin.japicmp.jspwiki-new}</version> <type>jar</type> </dependency> @@ -217,7 +329,9 @@ <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> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-main ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> <oldVersion> <dependency> <groupId>${project.groupId}</groupId> @@ -237,6 +351,85 @@ </newVersion> </configuration> </execution> + <execution> + <id>cmp-jspwiki-markdown</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-markdown ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <oldVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-markdown</artifactId> + <version>${plugin.japicmp.jspwiki-old}</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-tika-search-provider</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-tika-search-provider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <oldVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-tika-search-provider</artifactId> + <version>${plugin.japicmp.jspwiki-old}</version> + <type>jar</type> + </dependency> + </oldVersion> + <newVersion> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-tika-search-provider</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> + <execution> + <id>cmp-jspwiki-util</id> + <phase>generate-resources</phase> + <goals><goal>cmp</goal></goals> + <configuration> + <parameter> + <htmlTitle>Binary compatibility between jspwiki-util ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle> + </parameter> + <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-util</artifactId> + <version>${plugin.japicmp.jspwiki-new}</version> + <type>jar</type> + </dependency> + </newVersion> + </configuration> + </execution> </executions> </plugin> </plugins>
