diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index 842d1d6b7303662f9fe1e0d150ad88cda61132e4..3be275896406b1b944350fdf036976999621eb15 100644 --- a/goofy-server/pom.xml +++ b/goofy-server/pom.xml @@ -55,10 +55,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> - <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-client</artifactId> - </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -74,33 +70,6 @@ <artifactId>keycloak-admin-client</artifactId> </dependency> - <!-- log4j --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <scope>compile</scope> - </dependency> - <!-- jwt --> <dependency> <groupId>com.auth0</groupId> @@ -233,16 +202,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${surefire.jacoco.args}</argLine> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> -<!-- <configuration> --> -<!-- <argLine>${surefire.jacoco.args}</argLine> --> -<!-- </configuration> --> </plugin> <plugin> <groupId>org.springframework.boot</groupId> @@ -273,59 +236,4 @@ </plugins> </build> - <repositories> - <repository> - <id>ozg-nexus</id> - <name>ozg nexus</name> - <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> - </repository> - <repository> - <id>projectlombok.org</id> - <url>https://projectlombok.org/edge-releases</url> - </repository> - </repositories> - - - <profiles> - <profile> - <id>docker-build</id> - <build> - <plugins> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>dockerfile-maven-plugin</artifactId> - <version>1.4.13</version> - <configuration> - <username>admin</username> - <password>admin</password> - <repository>docker.ozg-sh.de/goofy</repository> - <tag>${git.branch}-${project.version}</tag> - <useMavenSettingsForAuth>true</useMavenSettingsForAuth> - <buildArgs> - <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> - </buildArgs> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>install</phase> - <goals> - <goal>build</goal> - <goal>tag</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/pom.xml b/pom.xml index 7cc2f6799236b7984cee654663a61b89aba5719f..6ed7b2bb5a35d3efe65bf5a478aa3537490b3f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,20 +25,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <pluto.version>0.18.0-SNAPSHOT</pluto.version> - - <grpc.spring-boot-starter.version>2.12.0.RELEASE</grpc.spring-boot-starter.version> - <spring-admin.version>2.3.1</spring-admin.version> - <mapstruct.version>1.4.2.Final</mapstruct.version> - <commons-io.version>2.11.0</commons-io.version> - <commons-beanutils.version>1.9.4</commons-beanutils.version> - <keycloak-adapter.version>15.0.2</keycloak-adapter.version> - <lombok.version>1.18.22</lombok.version> - <!-- <lombok.version>edge-SNAPSHOT</lombok.version> --> - - <lorem.version>2.1</lorem.version> - - <java-jwt.version>3.18.2</java-jwt.version> - <jjwt.version>0.9.1</jjwt.version> </properties> <dependencyManagement>