deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject [3/4] deltaspike git commit: DELTASPIKE-1191 Document duplications in gradle. Minor text clean up in test control as well.
Date Thu, 18 Aug 2016 00:35:09 GMT
DELTASPIKE-1191 Document duplications in gradle.  Minor text clean up in test control as well.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f8cf5ae4
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f8cf5ae4
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f8cf5ae4

Branch: refs/heads/master
Commit: f8cf5ae43f741ffc99bef1da0a9612095769142f
Parents: bfcfea8
Author: John D. Ament <johndament@apache.org>
Authored: Wed Aug 17 20:26:07 2016 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Wed Aug 17 20:31:57 2016 -0400

----------------------------------------------------------------------
 documentation/src/main/asciidoc/test-control.adoc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f8cf5ae4/documentation/src/main/asciidoc/test-control.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/test-control.adoc b/documentation/src/main/asciidoc/test-control.adoc
index c8aa277..ce877c8 100644
--- a/documentation/src/main/asciidoc/test-control.adoc
+++ b/documentation/src/main/asciidoc/test-control.adoc
@@ -427,7 +427,7 @@ constructor) and specify the target-type via `@TypedMock`.
 
 === JSF (via MyFaces-Test)
 
-add on of
+add one of
 
 * org.apache.deltaspike.testcontrol.impl.jsf.MockedJsf2TestContainer
 * org.apache.deltaspike.testcontrol.impl.jsf.MockedJsfTestContainerAdapter
@@ -436,7 +436,7 @@ add on of
 
 as content to
 
-/META-INF/services/org.apache.deltaspike.testcontrol.spi.ExternalContainer
+`/META-INF/services/org.apache.deltaspike.testcontrol.spi.ExternalContainer`
 
 (in your config-folder for tests, e.g. test/resources)
 
@@ -570,14 +570,18 @@ for resources to point to where the compiled code lives.  This is an
example of
 ----------------------------------------------------------------------------------------------------------
 sourceSets {
     main {
-        output.resourcesDir = 'build/classes/main'
-        output.classesDir   = 'build/classes/main'
+        output.resourcesDir = output.classesDir
     }
     test {
-        output.resourcesDir = 'build/classes/test'
-        output.classesDir   = 'build/classes/test'
+        output.resourcesDir = output.classesDir
     }
 }
+
+// ensure you're excluding duplicates
+
+jar {
+    duplicatesStrategy = 'exclude'
+}
 ----------------------------------------------------------------------------------------------------------
 
 == SPI


Mime
View raw message