This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
The following commit(s) were added to refs/heads/trunk by this push:
new 59d5c95 - Fix docker-testcontainer CTR.settings and update/add
informations in README.md; ignore generated file torque.usersettings.properties
in conf/test/docker-manager. - TODO surefire v.3.0.0-M5 still does not show
test as failed when exception in BeforeAll (dependencies conflict?), check
target/turbine-test.log. Removed surefire version already set in parent pom.
59d5c95 is described below
commit 59d5c9526f134b58b945c0a5ce09cca0340b3595
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Nov 22 12:39:07 2021 +0100
- Fix docker-testcontainer CTR.settings and update/add informations in
README.md; ignore generated file torque.usersettings.properties in
conf/test/docker-manager. - TODO surefire v.3.0.0-M5 still does not show test
as failed when exception in BeforeAll (dependencies conflict?), check
target/turbine-test.log. Removed surefire version already set in parent pom.
---
.gitignore | 2 ++
README.md | 24 ++++++++++++++++++++++
.../CompleteTurbineResources.properties | 11 ++++++++++
.../docker-manager/torque.usersettings.properties | 1 -
pom.xml | 7 ++-----
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 55238d4..6a849b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ logs
.idea
.settings
*.ser
+
+*torque.usersettings.properties
diff --git a/README.md b/README.md
index 804f42d..5a294b5 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,24 @@ information about Maven online at http://maven.apache.org/ .
Once Maven has been installed, just type 'mvn package'. The default behavior
is to compile, run the unit tests, and build the jar.
+
+### Docker Testcontainer (optional)
+
+To allow a simulation of an integrated environment you could start dockerized
tests (with tag docker)
+with the *docker-testcontainer* profile.
+
+ mvn clean test -Pdocker-testcontainer.
+
+This will initiate a start of an mysql database and an cleanup after tests are
completed.
+The currently used mapped ort is saved into the file
+ conf/test/docker-managertorque.usersettings.properties
+
+Find more about Docker-Testcontainer [here](https://www.testcontainers.org/).
+If you want to get one step further check out the Turbine-Archetype
[here](https://github.com/apache/turbine-archetypes).
+This allows you use an Turbine Maven archetype in a hosted or dockerized
environment.
+
+### Site Building
+
Some other useful goals:
mvn site - generate the site documention
@@ -37,7 +55,13 @@ Some other useful goals:
Activating Maven profile apache-release is not required, und may require a
signing process (you need a gpg key).
+
* deploy site
+
+ Either check out the branch asf-ste and copy /replace files from
target/site to the *root*, add and commit.
+ This will trigger (thanks to the .asf.yaml configuration) an update to the
distribution site.
+
+ Or run:
mvn clean site scm-publish:publish-scm -Papache-release
diff --git a/conf/test/docker-manager/CompleteTurbineResources.properties
b/conf/test/docker-manager/CompleteTurbineResources.properties
index f760f3d..10cd8ad 100644
--- a/conf/test/docker-manager/CompleteTurbineResources.properties
+++ b/conf/test/docker-manager/CompleteTurbineResources.properties
@@ -332,6 +332,8 @@ services.UIService.classname =
org.apache.turbine.services.ui.TurbineUIService
# Turn on the appropriate template service.
services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
+services.URLMapperService.classname=org.apache.turbine.services.urlmapper.TurbineURLMapperService
+
# -------------------------------------------------------------------
#
# R U N D A T A S E R V I C E
@@ -634,3 +636,12 @@ services.SessionService.earlyInit=true
#
# Default: none
# -------------------------------------------------------------------
+
+
+# -------------------------------------------------------------------
+#
+# U R L M A P P E R S E R V I C E
+#
+# -------------------------------------------------------------------
+
+services.URLMapperService.configFile = /conf/turbine-url-mapping.xml
diff --git a/conf/test/docker-manager/torque.usersettings.properties
b/conf/test/docker-manager/torque.usersettings.properties
deleted file mode 100644
index 774aa4c..0000000
--- a/conf/test/docker-manager/torque.usersettings.properties
+++ /dev/null
@@ -1 +0,0 @@
-torque.dsfactory.default.connection.url=jdbc:mysql://localhost:6950/default?loggerLevel=OFF
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2ded300..d4b9469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
<executions>
<execution>
<id>default-test</id>
@@ -1196,8 +1195,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>default-test</id>
@@ -1210,7 +1208,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>${turbine.surefire.version}</version>
</plugin>
</plugins>
</build>
@@ -1270,7 +1268,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
<executions>
<execution>
<id>default-test</id>
