Merge branch 'master' into feature/gitops_ready

# Conflicts:
#	Jenkinsfile
This commit is contained in:
Johannes Schnatterer 2021-10-11 16:24:22 +02:00
commit 0b457f9e4a
No known key found for this signature in database
GPG key ID: 1E32F54EDA5F06AA
2 changed files with 17 additions and 1 deletions

View file

@ -4,3 +4,17 @@ This is the well-known spring sample application petclinic that has been extende
See [cloudogu/k8s-gitops-playground](https://github.com/cloudogu/k8s-gitops-playground).
For more details on petclinic, see also [original spring petclinci readme.md](readme-petclinic.md).
---
### What is the Cloudogu EcoSystem?
The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry. We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus. The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [MIT License](https://cloudogu.com/license.html).
### How to get in touch?
Want to talk to the Cloudogu team? Need help or support? There are several ways to get in touch with us:
* [Website](https://cloudogu.com)
* [myCloudogu-Forum](https://forum.cloudogu.com/topic/34?ctx=1)
* [Email hello@cloudogu.com](mailto:hello@cloudogu.com)
---
© 2020 Cloudogu GmbH - MADE WITH :heart: FOR DEV ADDICTS. [Legal notice / Impressum](https://cloudogu.com/imprint.html)

View file

@ -17,7 +17,9 @@
<properties>
<!-- Generic properties -->
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>