Author: gk
Date: Tue Aug 2 13:57:09 2016
New Revision: 1754925
URL: http://svn.apache.org/viewvc?rev=1754925&view=rev
Log:
- Fulcrum PArent surefire update
- Intake xml fix
- Adding some hints into READMEs
Modified:
turbine/fulcrum/trunk/README.txt
turbine/fulcrum/trunk/intake/src/test/intake1.xml
turbine/fulcrum/trunk/parent/pom.xml
turbine/fulcrum/trunk/site/README.txt
Modified: turbine/fulcrum/trunk/README.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/README.txt?rev=1754925&r1=1754924&r2=1754925&view=diff
==============================================================================
--- turbine/fulcrum/trunk/README.txt (original)
+++ turbine/fulcrum/trunk/README.txt Tue Aug 2 13:57:09 2016
@@ -85,6 +85,9 @@ Steps
// - Generate artifacts (check local repo and target for artifacts) from
released version:
mvn clean install package -Papache-release -DcreateChecksum=true
+ // If not all jars are included (assembly plugin _SHOULD_ run after jar
generation), run a second time without clean
+ // If no md5 files are in the target folder, check local repo
+
// - SVN Add <binaries>, <sources> artifacts (jar/zip/tar.gz,asc,md5,sha1
files) to target repo
// - SVN Remove old releases binaries and sources
// After repos/dist is updated an automatic email will be generated, if no
update of the release database is done:
Modified: turbine/fulcrum/trunk/intake/src/test/intake1.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/intake1.xml?rev=1754925&r1=1754924&r2=1754925&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/intake1.xml (original)
+++ turbine/fulcrum/trunk/intake/src/test/intake1.xml Tue Aug 2 13:57:09 2016
@@ -18,7 +18,9 @@
under the License.
-->
<input-data xmlns="http://turbine.apache.org/schema/intake/4.0";
- basePackage="org.apache.fulcrum.intake.test.">
+ basePackage="org.apache.fulcrum.intake.test."
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://turbine.apache.org/schema/intake/4.0
intake.xsd">
<group name="LoginGroup" key="loginGroupKey" mapToObject="LoginForm">
<field name="Username" key="loginUsernameKey" type="String"
mapToProperty="Username">
Modified: turbine/fulcrum/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/pom.xml?rev=1754925&r1=1754924&r2=1754925&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/pom.xml (original)
+++ turbine/fulcrum/trunk/parent/pom.xml Tue Aug 2 13:57:09 2016
@@ -78,7 +78,7 @@
</profiles>
<properties>
- <turbine.surefire.version>2.12.4</turbine.surefire.version>
- <turbine.surefire-report.version>2.12.4</turbine.surefire-report.version>
+ <turbine.surefire.version>2.19.1</turbine.surefire.version>
+ <turbine.surefire-report.version>2.19.1</turbine.surefire-report.version>
</properties>
</project>
Modified: turbine/fulcrum/trunk/site/README.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/README.txt?rev=1754925&r1=1754924&r2=1754925&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/README.txt (original)
+++ turbine/fulcrum/trunk/site/README.txt Tue Aug 2 13:57:09 2016
@@ -8,19 +8,19 @@ into .html files using Maven.
<http://maven.apache.org/>
-Once you have the site checked out locally, cd into your
-fulcrum-site directory and execute:
+Using scm-publish Plugin, cft. http://commons.apache.org/site-publish.html for
publishing:
+
+Check first, that turbine.site.path matches the target pubScmUrl (e.g. by
investigating the result of mvn help:effective-pom)
+
+Once you have the site checked out locally, cd into your fulcrum-site
directory and execute:
mvn site
-This will build the documentation into the target/site/ directory. The output
-will show you which files got re-generated.
+This will build the documentation into the target/site/ directory. The output
will show you which files got re-generated.
-If you would like to make modifications to the web site documents,
-you simply need to edit the files in the xdocs/ directory.
+If you would like to make modifications to the web site documents, you simply
need to edit the files in the xdocs/ directory.
-Once you have built your documentation and confirmed that your changes are
-ok, you can check your .xml files back into Subversion.
+Once you have built your documentation and confirmed that your changes are ok,
you can check your .xml files back into Subversion.
To test what files would be deleted or updated run:
@@ -28,6 +28,9 @@ mvn site:stage scm-publish:publish-scm -
To deploy the site execute:
-mvn site-deploy
+mvn site:stage scm-publish:publish-scm
+
To do this you need an account on the people.apache.org machine!!
+
+
