fix svn, update readme, changes, explain module is a project site build component
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..0e8eaea
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+github:
+ features:
+ # Enable issue management
+ issues: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/README.md b/README.md
index 389e9df..1e44507 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,24 @@
## Description
-The Fulcrum site builds the wrapper site for the Fulcrum components listed in site.xml.
+The Fulcrum site builds the *wrapper site* for the Fulcrum components listed in site.xml.
+
+It is a Website repository, which is used to provides a mechanism (Management Tool) to *publish Turbine Fulcrum Components*, see [Apache Project site](https://infra.apache.org/project-site).
+
+Build Tool is the Maven site building mechanism, though this includes a version it does not contain released sources to be published and versioning of this component is just for convenience (or unavoidable in pom.xml). Nevertheless Apache Site management rules apply.
### Publishing
-Using scm-publish Plugin, cft. https://commons.apache.org/site-publish.html for publishing:
+This is described in section *Git Checkout source. Generate and Publish Site* here:
+
+ https://github.com/apache/turbine-fulcrum-build#git-checkout--source-generate-and-publish-site
+
+The basic mechanism is explained [here](https://infra.apache.org/version-control.html#git).
+
+
+### Deprecated SCM-Publish Maven Mechanism
+
+*Important*: Using [scm-publish Plugin](https://commons.apache.org/site-publish.html) for publishing is not yet tested for current [Apache GIT](https://infra.apache.org/version-control.html).
Check first, that turbine.site.path matches the target pubScmUrl (e.g. by investigating the result of mvn help:effective-pom)
diff --git a/pom.xml b/pom.xml
index 6357a49..f5a7705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>9-SNAPSHOT</version>
+ <version>9</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-site</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
<packaging>pom</packaging>
<name>Fulcrum Component Library</name>
<url>http://turbine.apache.org/fulcrum</url>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9e50f3e..8357804 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,7 +25,16 @@
</properties>
<body>
- <release version="2.0.0" date="SVN">
+ <release version="3.0.0" date="IN VERSION CONTROL">
+ <action dev="gk" type="update">
+ - Update to git SCM, turbine parent 9,
+ - Use modern skin, compatible with maven-site-plugin version 3.8.2
+ </action>
+ <action dev="tv" type="update">
+ Replace viewcvs with viewvc. Fixes TRB-95
+ </action>
+ </release>
+ <release version="2.0.0" date="2013-12-06">
<action dev="tv" type="update">
Moved security site to proper
</action>
diff --git a/xdocs/building.xml b/xdocs/building.xml
index e21bb31..6954ed1 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -39,14 +39,27 @@
<section name="Building all Fulcrum components">
<p>
- Building Fulcrum from SVN is now very easy because it has been
- Maven-enabled. Before you begin, you'll need to check out the
- <code>turbine-fulcrum</code> SVN repository (if you are
- not familiar with the Apache SVN repositories, please refer to
- the <a href="http://apache.org/dev/version-control.html">documentation</a>).
+ Building Fulcrum from GIT is very easy because it has been
+ Maven-enabled.
+
+ To get all Fulcrum dependencies you may find it conveniet to get all of them in one repo.
+
+ Therefore you would begin with <code>turbine-fulcrum-build</code> GIT repository (if you are
+ not familiar with the Apache GIT repositories, please refer to
+ the <a href="https://infra.apache.org/version-control.html">documentation</a>).
+
<source>
- svn checkout http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/
- </source>
+ git clone --recurse-submodules https://github.com/apache/turbine-fulcrum-build.git </source>
+
+ You get all current Fulcrum components (thanks to git submodules) in one repo!
+
+ Of course each fulcrum component has it's own repository. Find them in .gitmodules and select, what you want.
+ eihter using the gitbos repo URLs or the github repo
+ <source>
+ git clone https://gitbox.apache.org/repos/asf/turbine-fulcrum-parser.git
+ // equivalent
+ git clone https://github.com/apache/turbine-fulcrum-parser.git </source>
+
</p>
<h4>Maven 3 Build</h4>
<p>
@@ -59,8 +72,7 @@
From the root directory of the Fulcrum project (where you checked
out the code to or unpacked a source distribution), simply run
<source>
- mvn install
- </source>
+ mvn install </source>
This will start a process that will
build each component. After the component is built, it will be
installed into you local maven repository.
@@ -68,8 +80,7 @@
<p>
To build a local copy of the documentation, use this:
<source>
- mvn site
- </source>
+ mvn site </source>
This will build a local copy of the web site in the 'target/site' directory.
Note, this uses a LOT of memory. If you can't build all of them, build them individually.
</p>
@@ -80,12 +91,12 @@
complete build. One approach to take is to turn off running unit tests
<source><![CDATA[
$ mvn site -DskipTests=true
- ]]></source>
+]]></source>
and/or excluding various components:
</p>
<source><![CDATA[
$ mvn -pl parser,crypto site
- ]]></source>
+]]></source>
</subsection>
</section>
</body>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 23e6e3c..0fa9251 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -30,7 +30,7 @@
<p>
Fulcrum was originally created as part of the Turbine 3 effort. The idea
was to be able to decouple the services from Turbine 2 allowing them to be
- used on both projects. Turbine 4 uses now (2017) more than 15 Fulcrum components.
+ used on both projects. Turbine 4/5 uses now about 15 Fulcrum components.
</p>
<p>
Fulcrum has evolved into a component repository based on the Avalon framework.
@@ -82,14 +82,15 @@
Create issues and comments in Apache JIRA system <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+TRB+AND+component+%3D+Fulcrum">Turbine (Component Fulcrum)
</a></li>
<li>
- You can also access the <a href="https://svn.apache.org/viewvc/turbine/fulcrum/trunk/">Turbine Fulcrum SVN
- repository</a></li>
+ You can access the <a href="https://github.com/apache/turbine-fulcrum-build/">Turbine Fulcrum GIT Build
+ repository</a> or find the individual Fulcrum compnents from there.
+ The SVN Repo <a href="https://svn.apache.org/viewvc/turbine/fulcrum/trunk/">Fulcrum SVN Build</a> still exists, but has been set to readonly mode.</li>
<li>
- You can access the <a href="https://github.com/apache/turbine-fulcrum/">Turbine Fulcrum sub project Git (read only)
- repository</a></li>
+ You can access the <a href="https://github.com/apache/turbine-fulcrum-build/">Turbine Fulcrum sub project Git
+ repository</a>. N.B. https://github.com/apache/turbine-fulcrum/ has been moved to this fully git-enabled repository.</li>
-
+
</ul>
</section>
