This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git.
from d0a8064 Updating dependencies to get this to build again
add 018f6eb integrate merged and modified docker branch
add e55a118 update eclipse project, fix resource basedir in pom,
dockerfile commands more concise, fix myapp location due to using now
docker-resources / webapp in target folder, add metadata-complete (optional)
add 16887bf move data to src/main, adjusted arche-type-metadata.xml,
updated jetty using profile only now, dynamic jetty-env template and
conffiguring in pom.xml jettyEnvXml element
add d292503 added missing db resources, fixed pom merge, pass docker
variable from archetype, add docker outputs, add scanIntervalSeconds
add f2a9ab9 db adjustments, fixes dynamic, skip resource scan, if calling
jetty profile, update log4j, add more documentation
new a142346 fix configuration bugs in docker-compose, and maven plugin
group maven settings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.project | 6 +-
pom.xml | 52 ++++-
src/changes/changes.xml | 5 +
.../META-INF/maven/archetype-metadata.xml | 22 +-
.../archetype-resources/docs/DOCKER-README.md | 237 +++++++++++++++++++++
.../resources/archetype-resources/docs/README.md | 30 ++-
src/main/resources/archetype-resources/pom.xml | 188 ++++++++++------
.../data}/sample-mysql-data/_application-data.sql | 0
.../sample-mysql-data/_turbine-security-data.sql | 0
.../src/main/docker-resources/app/Dockerfile | 18 ++
.../src/main/docker-resources/app/settings.xml | 69 ++++++
.../src/main/docker-resources/db/Dockerfile | 61 ++++++
.../src/main/docker-resources/db/mysql/conf/my.cnf | 34 +++
.../db/mysql/init/data.sql} | 0
.../db/mysql/log/log.out} | 0
.../src/main/docker-resources/docker-compose.yml | 74 +++++++
.../src/main/webapp/WEB-INF/jetty-env.xml | 15 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/test/resources/log4j.properties | 89 --------
.../src/test/resources/log4j.xml | 56 +++++
.../resources/projects/first/archetype.properties | 4 +-
21 files changed, 793 insertions(+), 169 deletions(-)
create mode 100644 src/main/resources/archetype-resources/docs/DOCKER-README.md
rename src/main/resources/archetype-resources/{docs =>
src/main/data}/sample-mysql-data/_application-data.sql (100%)
rename src/main/resources/archetype-resources/{docs =>
src/main/data}/sample-mysql-data/_turbine-security-data.sql (100%)
create mode 100644
src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
create mode 100644
src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml
create mode 100644
src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
create mode 100644
src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
copy src/main/resources/archetype-resources/src/main/{webapp/logs/KEEPME =>
docker-resources/db/mysql/init/data.sql} (100%)
copy src/main/resources/archetype-resources/src/main/{webapp/logs/KEEPME =>
docker-resources/db/mysql/log/log.out} (100%)
create mode 100644
src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
delete mode 100644
src/main/resources/archetype-resources/src/test/resources/log4j.properties
create mode 100644
src/main/resources/archetype-resources/src/test/resources/log4j.xml
