Author: gk
Date: Tue Jul 23 09:31:39 2019
New Revision: 1863620
URL: http://svn.apache.org/viewvc?rev=1863620&view=rev
Log:
- update fulcrums with parent 6
- update fulcrum quartz to 2.3.1
- update fulcrumtestcontainer deps mockito 2.28.2, junit.jupiter to 5.5.1,
junit-platform-runner to 1.5.1
- update README.txt
Modified:
turbine/fulcrum/trunk/README.txt
turbine/fulcrum/trunk/bsf/pom.xml
turbine/fulcrum/trunk/cache/pom.xml
turbine/fulcrum/trunk/commonsemail/pom.xml
turbine/fulcrum/trunk/configuration/impl/pom.xml
turbine/fulcrum/trunk/crypto/pom.xml
turbine/fulcrum/trunk/groovy/pom.xml
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/mimetype/pom.xml
turbine/fulcrum/trunk/pom.xml
turbine/fulcrum/trunk/pool/pom.xml
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/script/pom.xml
turbine/fulcrum/trunk/site/pom.xml
turbine/fulcrum/trunk/site/src/site/site.xml
turbine/fulcrum/trunk/site/xdocs/index.xml
turbine/fulcrum/trunk/testcontainer/pom.xml
turbine/fulcrum/trunk/xmlrpc/pom.xml
turbine/fulcrum/trunk/yaafi-crypto/pom.xml
turbine/fulcrum/trunk/yaafi/pom.xml
Modified: turbine/fulcrum/trunk/README.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/README.txt?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/README.txt (original)
+++ turbine/fulcrum/trunk/README.txt Tue Jul 23 09:31:39 2019
@@ -61,6 +61,7 @@ More Information
Steps
1) Local Testing
// Verify gpg.homedir, gpg.useagent, gpg.passphrase. Check, if
-Dgpg.useagent=false is needed, see below comment to pinentry.
+ // You may need to add additional profiles, e.g. -Papache-release,java8
mvn clean site install -Papache-release -Dgpg.passphrase=<xx>
// multi module
mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Papache-release
@@ -75,7 +76,7 @@ Steps
mvn release:prepare -DautoVersionSubmodules=true -P apache-release
// success will be on the master build, the others are skipped
// single
- mvn release:prepare -P apache-release
+ mvn release:prepare -Papache-release
// Helpful hint from Apache Website: If you're located in Europe then
release:prepare may fail with 'Unable to tag SCM' and ' svn: No such revision X
'. Wait 10 seconds and run mvn release:prepare again.
4) Release Preparing
@@ -111,6 +112,7 @@ Steps
//
http://maven.apache.org/developers/website/deploy-component-reference-documentation.html
// SVN Checkout <tagged release version> source
// Generate and Publish Site
+ // IMPORTANT: You may have clean up the checkoutDirectory of
maven-scm-publish-plugin plugin after doing a dry run!
// multi module
mvn site site:stage scm-publish:publish-scm -Dscmpublish.dryRun=true
mvn clean site site:stage scm-publish:publish-scm -Dusername=<username>
-Dpassword=<pw>
Modified: turbine/fulcrum/trunk/bsf/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/bsf/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/bsf/pom.xml (original)
+++ turbine/fulcrum/trunk/bsf/pom.xml Tue Jul 23 09:31:39 2019
@@ -15,7 +15,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/cache/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/pom.xml (original)
+++ turbine/fulcrum/trunk/cache/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/commonsemail/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/commonsemail/pom.xml (original)
+++ turbine/fulcrum/trunk/commonsemail/pom.xml Tue Jul 23 09:31:39 2019
@@ -23,7 +23,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/configuration/impl/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/configuration/impl/pom.xml (original)
+++ turbine/fulcrum/trunk/configuration/impl/pom.xml Tue Jul 23 09:31:39 2019
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/crypto/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/crypto/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath />
</parent>
Modified: turbine/fulcrum/trunk/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/groovy/pom.xml (original)
+++ turbine/fulcrum/trunk/groovy/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Tue Jul 23 09:31:39 2019
@@ -20,7 +20,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/mimetype/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/pom.xml (original)
+++ turbine/fulcrum/trunk/mimetype/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pom.xml (original)
+++ turbine/fulcrum/trunk/pom.xml Tue Jul 23 09:31:39 2019
@@ -22,7 +22,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<artifactId>fulcrum</artifactId>
<packaging>pom</packaging>
Modified: turbine/fulcrum/trunk/pool/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pool/pom.xml (original)
+++ turbine/fulcrum/trunk/pool/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Tue Jul 23 09:31:39 2019
@@ -80,10 +80,11 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
+ <!-- 2.3.1 fixes https://github.com/quartz-scheduler/quartz/issues/316 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
Modified: turbine/fulcrum/trunk/script/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/script/pom.xml (original)
+++ turbine/fulcrum/trunk/script/pom.xml Tue Jul 23 09:31:39 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
Modified: turbine/fulcrum/trunk/site/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/pom.xml (original)
+++ turbine/fulcrum/trunk/site/pom.xml Tue Jul 23 09:31:39 2019
@@ -23,7 +23,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6-SNAPSHOT</version>
+ <version>6</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
Modified: turbine/fulcrum/trunk/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/src/site/site.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/site/src/site/site.xml Tue Jul 23 09:31:39 2019
@@ -38,7 +38,7 @@
</links>
<menu name="Fulcrum">
- <item name="Overview" href="/"/>
+ <item name="Overview" href="/index.html"/>
<item name="Download and Build" href="/building.html"/>
</menu>
Modified: turbine/fulcrum/trunk/site/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/xdocs/index.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/site/xdocs/index.xml Tue Jul 23 09:31:39 2019
@@ -60,7 +60,8 @@
<p>
Download the current main release sources and binaries through the Apache
mirror system at
- <a href="http://www.apache.org/dyn/closer.cgi/turbine/fulcrum/";>the
fulcrum download site</a>.
+ <a href="http://www.apache.org/dyn/closer.cgi/turbine/fulcrum/";>the
fulcrum download site</a>
+ or from <a
href="https://github.com/apache/turbine-fulcrum/releases";>Github Fulcrum
Release</a> Section.
</p>
</section>
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<name>Fulcrum Test Container</name>
<inceptionYear>2004</inceptionYear>
<description>A test framework for Avalon components</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</connection>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
+ <version>2.28.2</version>
</dependency>
<!-- Needed if testing with ECM -->
<dependency>
@@ -127,20 +127,20 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
<!-- log4j1.2 bridge instead of log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
@@ -175,16 +175,15 @@
</plugins>
</build>
- <properties>
+ <properties>
- <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
+ <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
-
<turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
-
<siteContent.path>${project.build.directory}/staging</siteContent.path><!--
default stagingSiteURL -->
- <junit.jupiter.version>5.3.2</junit.jupiter.version>
- <junit.platform>1.3.2</junit.platform>
- <log4j2.version>2.11.1</log4j2.version>
- </properties>
+ <junit.jupiter.version>5.5.1</junit.jupiter.version>
+ <junit.platform>1.5.1</junit.platform>
+ <!--junit.platform>1.3.2</junit.platform-->
+
<!--turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache-->
+ </properties>
-</project>
+</project>
Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/pom.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/pom.xml Tue Jul 23 09:31:39 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/yaafi-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi-crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/yaafi-crypto/pom.xml Tue Jul 23 09:31:39 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/yaafi/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/pom.xml?rev=1863620&r1=1863619&r2=1863620&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/pom.xml (original)
+++ turbine/fulcrum/trunk/yaafi/pom.xml Tue Jul 23 09:31:39 2019
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
