Merge pull request #30 from aguibert/mkdocs-cleanup

Mkdocs cleanup and module organization
MicroShed · Aug 27, 2019 · c008a10 · c008a10
2 parents f6c6d0d + fadc17d
commit c008a10
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 42 deletions.
diff --git a/.envrc b/.envrc
diff --git a/Pipfile b/Pipfile
diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/liberty/build.gradle → modules/liberty/build.gradle b/liberty/build.gradle → modules/liberty/build.gradle
diff --git a/...rs/containers/liberty/LibertyAdapter.java → ...rs/containers/liberty/LibertyAdapter.java b/...rs/containers/liberty/LibertyAdapter.java → ...rs/containers/liberty/LibertyAdapter.java
diff --git a/...containers.microprofile.spi.ServerAdapter → ...containers.microprofile.spi.ServerAdapter b/...containers.microprofile.spi.ServerAdapter → ...containers.microprofile.spi.ServerAdapter
diff --git a/liberty/src/main/resources/log4j.properties → ...berty/src/main/resources/log4j.properties b/liberty/src/main/resources/log4j.properties → ...berty/src/main/resources/log4j.properties
diff --git a/testcontainers/build.gradle → modules/testcontainers/build.gradle b/testcontainers/build.gradle → modules/testcontainers/build.gradle
diff --git a/...rs/HollowTestcontainersConfiguration.java → ...rs/HollowTestcontainersConfiguration.java b/...rs/HollowTestcontainersConfiguration.java → ...rs/HollowTestcontainersConfiguration.java
diff --git a/...ntainers/TestcontainersConfiguration.java → ...ntainers/TestcontainersConfiguration.java b/...ntainers/TestcontainersConfiguration.java → ...ntainers/TestcontainersConfiguration.java
diff --git a/...ers/microprofile/ImageFromDockerfile.java → ...ers/microprofile/ImageFromDockerfile.java b/...ers/microprofile/ImageFromDockerfile.java → ...ers/microprofile/ImageFromDockerfile.java
diff --git a/...microprofile/MicroProfileApplication.java → ...microprofile/MicroProfileApplication.java b/...microprofile/MicroProfileApplication.java → ...microprofile/MicroProfileApplication.java
diff --git a/...rs/microprofile/SystemOutLogConsumer.java → ...rs/microprofile/SystemOutLogConsumer.java b/...rs/microprofile/SystemOutLogConsumer.java → ...rs/microprofile/SystemOutLogConsumer.java
diff --git a/...iners/microprofile/spi/ServerAdapter.java → ...iners/microprofile/spi/ServerAdapter.java b/...iners/microprofile/spi/ServerAdapter.java → ...iners/microprofile/spi/ServerAdapter.java
diff --git a/requirements.txt b/requirements.txt
diff --git a/runtime.txt b/runtime.txt
diff --git a/settings.gradle b/settings.gradle
@@ -3,11 +3,11 @@ rootProject.name = 'system-test'
 include  "system-test-core"
 project(':system-test-core').projectDir = "$rootDir/core" as File
 
-include  "system-test-testcontainers"
-project(':system-test-testcontainers').projectDir = "$rootDir/testcontainers" as File
-
-include  "system-test-liberty"
-project(':system-test-liberty').projectDir = "$rootDir/liberty" as File
+// Include all module projects as system-test-<MODULE>
+file('modules').eachDir { dir ->
+	include  'system-test-' + dir.name
+	project(':system-test-' + dir.name).projectDir = dir
+}
 
 // Include all test app projects as system-test-<APP_NAME>
 file('sample-apps').eachDir { dir ->