Merge branch 'dev' into 'master' (ffe396af) · Commits · REDMIC Project / Server / Time Series

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,3 +6,4 @@
		!.env
		**/target
		*/dist
		pom.xml.*

.gitlab-ci.yml

+26 −238

Original line number	Diff line number	Diff line
		include:
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/maven-building-functional-unit.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/license-listing.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/packaging.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment-functional-unit.yml'

		stages:
		- build-lib
		- build-services
		- build-service
		- license-list
		- package
		- test-package
		- deploy

		variables:
		DOCKER_DRIVER: overlay2
		DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}
		STACK: time-series
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

		services:
		- docker:dind

		maven-build-lib:
		stage: build-lib
		image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}
		variables:
		SPRING_PROFILES_ACTIVE: test
		LOGGING_LEVEL_ROOT: error
		LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error
		only:
		- branches
		cache:
		paths:
		- .m2/repository/
		script:
		- mvn -pl :${CI_PROJECT_NAME}-lib -U clean deploy -B
		- "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-lib/target/site/jacoco/index.html)"
		- 'echo "Coverage: ${COVERAGE}"'
		after_script:
		- rm -rf .m2/repository/es
		artifacts:
		name: "${CI_PROJECT_NAME}-lib-${CI_COMMIT_REF_NAME}"
		expire_in: '6 months'
		paths:
		- "${CI_PROJECT_NAME}-lib/target/*.jar"

		maven-build-commands:
		stage: build-services
		image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}
		variables:
		SPRING_PROFILES_ACTIVE: test
		LOGGING_LEVEL_ROOT: "off"
		LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error
		LOGGING_LEVEL_ES_REDMIC: error
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}
		only:
		- branches
		cache:
		paths:
		- .m2/repository/
		script:
		- mvn -pl :${CI_PROJECT_NAME}-commands -U clean verify spring-boot:repackage -B
		- "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-commands/target/site/jacoco/index.html)"
		- 'echo "Coverage: ${COVERAGE}"'
		after_script:
		- rm -rf .m2/repository/es
		artifacts:
		name: "${CI_PROJECT_NAME}-commands-${CI_COMMIT_REF_NAME}"
		expire_in: '6 months'
		paths:
		- "${CI_PROJECT_NAME}-commands/dist/*.jar"
		- "${CI_PROJECT_NAME}-commands/target/generated-docs"

		maven-build-view:
		stage: build-services
		image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}
		variables:
		GIT_SUBMODULE_STRATEGY: normal
		SPRING_PROFILES_ACTIVE: test
		LOGGING_LEVEL_ROOT: error
		LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}
		ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}
		only:
		- branches
		cache:
		paths:
		- .m2/repository/
		script:
		before_script:
		- mvn -f elasticsearch-cluster-runner compile
		- mvn -f elasticsearch-cluster-runner exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" > elasticsearch-cluster-runner-out.txt &
		- mvn -pl :${CI_PROJECT_NAME}-view -U clean verify spring-boot:repackage -B
		- "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-view/target/site/jacoco/index.html)"
		- 'echo "Coverage: ${COVERAGE}"'
		after_script:
		- rm -rf .m2/repository/es
		artifacts:
		name: "${CI_PROJECT_NAME}-view-${CI_COMMIT_REF_NAME}"
		expire_in: '6 months'
		paths:
		- "${CI_PROJECT_NAME}-view/dist/*.jar"
		- "${CI_PROJECT_NAME}-view/target/generated-docs"
		- "elasticsearch-cluster-runner-out.txt"
		when: always

		docker-build-commit-non-master-branches:
		stage: package
		image: docker:stable
		variables:
		PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG: latest
		services:
		- docker:dind
		only:
		- branches
		except:
		- master
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- >
		docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}
		-t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .
		- docker push ${CI_REGISTRY_IMAGE}

		docker-build-commit-master-branch:
		stage: package
		image: docker:stable
		variables:
		PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG: latest
		services:
		- docker:dind
		only:
		- master
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- >
		docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}
		-t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .
		- docker push ${CI_REGISTRY_IMAGE}

		docker-tag-already-built-image:
		stage: package
		image: docker:stable
		services:
		- docker:dind
		only:
		- tags
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
		- docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
		- docker push ${CI_REGISTRY_IMAGE}
		- mvn -f elasticsearch-cluster-runner exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" &

		container-scanning:
		stage: test-package
		image: docker:stable
		allow_failure: true
		services:
		- docker:stable-dind
		only:
		- branches
		script:
		- docker run -d --name db arminc/clair-db:latest
		- docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
		- apk add -U wget ca-certificates
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
		- wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
		- mv clair-scanner_linux_amd64 clair-scanner
		- chmod +x clair-scanner
		- touch clair-whitelist.yml
		- >
		./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log
		-w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} \|\| true
		artifacts:
		paths: [gl-sast-container-report.json]

		deploy-commands-supporting-branch:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-commands
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-commands
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- branches
		except:
		- master
		when: manual

		deploy-view-supporting-branch:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-view
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}
		ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-view
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- branches
		except:
		- master
		when: manual

		deploy-commands-pro:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-commands
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.prod.yml
		SPRING_PROFILES_ACTIVE: prod
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		.deploy-commands:
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro/${CI_PROJECT_NAME}-commands
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- master
		when: manual
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

		deploy-view-pro:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-view
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.prod.yml
		SPRING_PROFILES_ACTIVE: prod
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		.deploy-view:
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		@@ -259,8 +51,4 @@ deploy-view-pro:
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}
		ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro/${CI_PROJECT_NAME}-view
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- master
		when: manual
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

LICENSE

0 → 100644

+201 −0

Original line number	Diff line number	Diff line
		Apache License
		Version 2.0, January 2004
		http://www.apache.org/licenses/

		TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

		1. Definitions.

		"License" shall mean the terms and conditions for use, reproduction,
		and distribution as defined by Sections 1 through 9 of this document.

		"Licensor" shall mean the copyright owner or entity authorized by
		the copyright owner that is granting the License.

		"Legal Entity" shall mean the union of the acting entity and all
		other entities that control, are controlled by, or are under common
		control with that entity. For the purposes of this definition,
		"control" means (i) the power, direct or indirect, to cause the
		direction or management of such entity, whether by contract or
		otherwise, or (ii) ownership of fifty percent (50%) or more of the
		outstanding shares, or (iii) beneficial ownership of such entity.

		"You" (or "Your") shall mean an individual or Legal Entity
		exercising permissions granted by this License.

		"Source" form shall mean the preferred form for making modifications,
		including but not limited to software source code, documentation
		source, and configuration files.

		"Object" form shall mean any form resulting from mechanical
		transformation or translation of a Source form, including but
		not limited to compiled object code, generated documentation,
		and conversions to other media types.

		"Work" shall mean the work of authorship, whether in Source or
		Object form, made available under the License, as indicated by a
		copyright notice that is included in or attached to the work
		(an example is provided in the Appendix below).

		"Derivative Works" shall mean any work, whether in Source or Object
		form, that is based on (or derived from) the Work and for which the
		editorial revisions, annotations, elaborations, or other modifications
		represent, as a whole, an original work of authorship. For the purposes
		of this License, Derivative Works shall not include works that remain
		separable from, or merely link (or bind by name) to the interfaces of,
		the Work and Derivative Works thereof.

		"Contribution" shall mean any work of authorship, including
		the original version of the Work and any modifications or additions
		to that Work or Derivative Works thereof, that is intentionally
		submitted to Licensor for inclusion in the Work by the copyright owner
		or by an individual or Legal Entity authorized to submit on behalf of
		the copyright owner. For the purposes of this definition, "submitted"
		means any form of electronic, verbal, or written communication sent
		to the Licensor or its representatives, including but not limited to
		communication on electronic mailing lists, source code control systems,
		and issue tracking systems that are managed by, or on behalf of, the
		Licensor for the purpose of discussing and improving the Work, but
		excluding communication that is conspicuously marked or otherwise
		designated in writing by the copyright owner as "Not a Contribution."

		"Contributor" shall mean Licensor and any individual or Legal Entity
		on behalf of whom a Contribution has been received by Licensor and
		subsequently incorporated within the Work.

		2. Grant of Copyright License. Subject to the terms and conditions of
		this License, each Contributor hereby grants to You a perpetual,
		worldwide, non-exclusive, no-charge, royalty-free, irrevocable
		copyright license to reproduce, prepare Derivative Works of,
		publicly display, publicly perform, sublicense, and distribute the
		Work and such Derivative Works in Source or Object form.

		3. Grant of Patent License. Subject to the terms and conditions of
		this License, each Contributor hereby grants to You a perpetual,
		worldwide, non-exclusive, no-charge, royalty-free, irrevocable
		(except as stated in this section) patent license to make, have made,
		use, offer to sell, sell, import, and otherwise transfer the Work,
		where such license applies only to those patent claims licensable
		by such Contributor that are necessarily infringed by their
		Contribution(s) alone or by combination of their Contribution(s)
		with the Work to which such Contribution(s) was submitted. If You
		institute patent litigation against any entity (including a
		cross-claim or counterclaim in a lawsuit) alleging that the Work
		or a Contribution incorporated within the Work constitutes direct
		or contributory patent infringement, then any patent licenses
		granted to You under this License for that Work shall terminate
		as of the date such litigation is filed.

		4. Redistribution. You may reproduce and distribute copies of the
		Work or Derivative Works thereof in any medium, with or without
		modifications, and in Source or Object form, provided that You
		meet the following conditions:

		(a) You must give any other recipients of the Work or
		Derivative Works a copy of this License; and

		(b) You must cause any modified files to carry prominent notices
		stating that You changed the files; and

		(c) You must retain, in the Source form of any Derivative Works
		that You distribute, all copyright, patent, trademark, and
		attribution notices from the Source form of the Work,
		excluding those notices that do not pertain to any part of
		the Derivative Works; and

		(d) If the Work includes a "NOTICE" text file as part of its
		distribution, then any Derivative Works that You distribute must
		include a readable copy of the attribution notices contained
		within such NOTICE file, excluding those notices that do not
		pertain to any part of the Derivative Works, in at least one
		of the following places: within a NOTICE text file distributed
		as part of the Derivative Works; within the Source form or
		documentation, if provided along with the Derivative Works; or,
		within a display generated by the Derivative Works, if and
		wherever such third-party notices normally appear. The contents
		of the NOTICE file are for informational purposes only and
		do not modify the License. You may add Your own attribution
		notices within Derivative Works that You distribute, alongside
		or as an addendum to the NOTICE text from the Work, provided
		that such additional attribution notices cannot be construed
		as modifying the License.

		You may add Your own copyright statement to Your modifications and
		may provide additional or different license terms and conditions
		for use, reproduction, or distribution of Your modifications, or
		for any such Derivative Works as a whole, provided Your use,
		reproduction, and distribution of the Work otherwise complies with
		the conditions stated in this License.

		5. Submission of Contributions. Unless You explicitly state otherwise,
		any Contribution intentionally submitted for inclusion in the Work
		by You to the Licensor shall be under the terms and conditions of
		this License, without any additional terms or conditions.
		Notwithstanding the above, nothing herein shall supersede or modify
		the terms of any separate license agreement you may have executed
		with Licensor regarding such Contributions.

		6. Trademarks. This License does not grant permission to use the trade
		names, trademarks, service marks, or product names of the Licensor,
		except as required for reasonable and customary use in describing the
		origin of the Work and reproducing the content of the NOTICE file.

		7. Disclaimer of Warranty. Unless required by applicable law or
		agreed to in writing, Licensor provides the Work (and each
		Contributor provides its Contributions) on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
		implied, including, without limitation, any warranties or conditions
		of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
		PARTICULAR PURPOSE. You are solely responsible for determining the
		appropriateness of using or redistributing the Work and assume any
		risks associated with Your exercise of permissions under this License.

		8. Limitation of Liability. In no event and under no legal theory,
		whether in tort (including negligence), contract, or otherwise,
		unless required by applicable law (such as deliberate and grossly
		negligent acts) or agreed to in writing, shall any Contributor be
		liable to You for damages, including any direct, indirect, special,
		incidental, or consequential damages of any character arising as a
		result of this License or out of the use or inability to use the
		Work (including but not limited to damages for loss of goodwill,
		work stoppage, computer failure or malfunction, or any and all
		other commercial damages or losses), even if such Contributor
		has been advised of the possibility of such damages.

		9. Accepting Warranty or Additional Liability. While redistributing
		the Work or Derivative Works thereof, You may choose to offer,
		and charge a fee for, acceptance of support, warranty, indemnity,
		or other liability obligations and/or rights consistent with this
		License. However, in accepting such obligations, You may act only
		on Your own behalf and on Your sole responsibility, not on behalf
		of any other Contributor, and only if You agree to indemnify,
		defend, and hold each Contributor harmless for any liability
		incurred by, or claims asserted against, such Contributor by reason
		of your accepting any such warranty or additional liability.

		END OF TERMS AND CONDITIONS

		APPENDIX: How to apply the Apache License to your work.

		To apply the Apache License to your work, attach the following
		boilerplate notice, with the fields enclosed by brackets "{}"
		replaced with your own identifying information. (Don't include
		the brackets!) The text should be enclosed in the appropriate
		comment syntax for the file format. We also recommend that a
		file or class name and description of purpose be included on the
		same "printed page" as the copyright notice for easier
		identification within third-party archives.

		Copyright 2019 REDMIC Project / Server

		Licensed 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.

pom.xml

+17 −64

File changed.

Preview size limit exceeded, changes collapsed.

time-series-commands/pom.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		<parent>
		<groupId>es.redmic.time-series</groupId>
		<artifactId>time-series</artifactId>
		<version>0.2.1</version>
		<version>0.3.0</version>
		</parent>

		<modelVersion>4.0.0</modelVersion>