From 87cf2e994952b11249baba3eb0adc7088481cede Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 28 Jul 2021 12:18:07 +0200 Subject: [PATCH] OZG-409 further attempt at formatting --- goofy-server/pom.xml | 50 ++++++++++++++++++++++---------------------- pom.xml | 40 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index 2d40aba8bf..4c530f5b18 100644 --- a/goofy-server/pom.xml +++ b/goofy-server/pom.xml @@ -1,27 +1,27 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - + <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>de.itvsh.ozg</groupId> <artifactId>goofy</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - + <artifactId>goofy-server</artifactId> <name>Goofy Server</name> <description>Projekt packaging deployment artefact</description> <packaging>jar</packaging> - + <properties> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> - + <spring-boot.build-image.imageName>docker.ozg-sh.de/goofy:build-latest</spring-boot.build-image.imageName> </properties> - + <dependencies> <!-- Spring --> <dependency> @@ -44,12 +44,12 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-validation</artifactId> </dependency> - + <dependency> <groupId>net.devh</groupId> <artifactId>grpc-client-spring-boot-starter</artifactId> </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> @@ -58,12 +58,12 @@ <groupId>de.codecentric</groupId> <artifactId>spring-boot-admin-starter-client</artifactId> </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency> - + <dependency> <groupId>org.keycloak</groupId> <artifactId>keycloak-spring-boot-starter</artifactId> @@ -72,25 +72,25 @@ <groupId>org.keycloak</groupId> <artifactId>keycloak-admin-client</artifactId> </dependency> - + <dependency> <groupId>com.graphql-java</groupId> <artifactId>graphql-java-spring-boot-starter-webmvc</artifactId> <version>2.0</version> </dependency> - + <!-- own projects --> <dependency> <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-interface</artifactId> </dependency> - + <!-- tools --> <dependency> <groupId>org.mapstruct</groupId> <artifactId>mapstruct</artifactId> </dependency> - + <!-- aspectJ --> <dependency> <groupId>org.aspectj</groupId> @@ -100,7 +100,7 @@ <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> </dependency> - + <!-- Dev --> <dependency> <groupId>org.projectlombok</groupId> @@ -111,7 +111,7 @@ <artifactId>spring-boot-devtools</artifactId> <scope>runtime</scope> </dependency> - + <!-- commons --> <dependency> <groupId>org.apache.commons</groupId> @@ -121,14 +121,14 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - + <!-- Logging --> <dependency> <groupId>net.logstash.logback</groupId> <artifactId>logstash-logback-encoder</artifactId> <version>6.3</version> </dependency> - + <!-- Test --> <dependency> <groupId>org.springframework.boot</groupId> @@ -176,7 +176,7 @@ <optional>true</optional> </dependency> </dependencies> - + <build> <finalName>${project.artifactId}</finalName> <plugins> @@ -201,7 +201,7 @@ </path> <!-- other annotation processors --> </annotationProcessorPaths> - + <showWarnings>true</showWarnings> <compilerArgs> <compilerArg> @@ -223,7 +223,7 @@ </compilerArgs> </configuration> </plugin> - + <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> @@ -265,7 +265,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -287,7 +287,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> @@ -306,7 +306,7 @@ </plugin> </plugins> </build> - + <repositories> <repository> <id>ozg-nexus</id> @@ -314,7 +314,7 @@ <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> </repository> </repositories> - + <profiles> <profile> <id>docker-build</id> diff --git a/pom.xml b/pom.xml index 0842bded44..058e53db86 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,26 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - + <modelVersion>4.0.0</modelVersion> <groupId>de.itvsh.ozg</groupId> <artifactId>goofy</artifactId> <version>0.9.0-SNAPSHOT</version> <name>Goofy Parent</name> <packaging>pom</packaging> - + <modules> <module>goofy-client</module> <module>goofy-server</module> </modules> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>16</java.version> - + <pluto.version>${project.version}</pluto.version> - + <spring.boot.version>2.4.5</spring.boot.version> <grpc.spring-boot-starter.version>2.10.1.RELEASE</grpc.spring-boot-starter.version> <spring-admin.version>2.3.1</spring-admin.version> @@ -28,9 +28,9 @@ <commons-io.version>2.8.0</commons-io.version> <keycloak-adapter.version>14.0.0</keycloak-adapter.version> <lombok.version>1.18.20</lombok.version> - + <lorem.version>2.1</lorem.version> - + <!-- plugins --> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <resources.plugin.version>3.1.0</resources.plugin.version> @@ -39,7 +39,7 @@ <git-comit-id.plugin.version>4.0.3</git-comit-id.plugin.version> <sonarqube.version>3.8.0.2131</sonarqube.version> </properties> - + <dependencyManagement> <dependencies> <!-- spring --> @@ -50,7 +50,7 @@ <type>pom</type> <scope>import</scope> </dependency> - + <!-- keycloak --> <dependency> <groupId>org.keycloak.bom</groupId> @@ -64,20 +64,20 @@ <artifactId>keycloak-admin-client</artifactId> <version>${keycloak-adapter.version}</version> </dependency> - + <dependency> <groupId>de.codecentric</groupId> <artifactId>spring-boot-admin-starter-client</artifactId> <version>${spring-admin.version}</version> </dependency> - + <!-- commons --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> </dependency> - + <!-- tools --> <dependency> <groupId>org.mapstruct</groupId> @@ -89,13 +89,13 @@ <artifactId>grpc-client-spring-boot-starter</artifactId> <version>${grpc.spring-boot-starter.version}</version> </dependency> - + <dependency> <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-interface</artifactId> <version>${pluto.version}</version> </dependency> - + <dependency> <groupId>com.thedeanda</groupId> <artifactId>lorem</artifactId> @@ -104,7 +104,7 @@ </dependency> </dependencies> </dependencyManagement> - + <build> <pluginManagement> <plugins> @@ -113,7 +113,7 @@ <artifactId>maven-resources-plugin</artifactId> <version>${resources.plugin.version}</version> </plugin> - + <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> @@ -130,7 +130,7 @@ <goal>repackage</goal> </goals> </execution> - + <execution> <id>build info</id> <goals> @@ -156,13 +156,13 @@ </argLine> </configuration> </plugin> - + <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> <version>${sonarqube.version}</version> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -190,7 +190,7 @@ </plugins> </pluginManagement> </build> - + <distributionManagement> <repository> <id>ozg-nexus</id> -- GitLab