Skip to content

Commit

Permalink
EPA-111: Format POMs
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasrichner-oviva
thomasrichner-oviva committed Apr 30, 2024
1 parent 9f7bb57 commit 879be81
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 79 deletions.
13 changes: 4 additions & 9 deletions ehealthid-cli/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -11,11 +9,9 @@
</parent>

<artifactId>ehealthid-cli</artifactId>
<description>
Generator for entity-statements in the TI federation. This can generate the necessary
keys as well as the registration xml.
</description>
<packaging>jar</packaging>
<description>Generator for entity-statements in the TI federation. This can generate the necessary
keys as well as the registration xml.</description>

<dependencies>
<dependency>
Expand Down Expand Up @@ -128,16 +124,15 @@
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
</execution>
</executions>

</plugin>
</plugins>
</build>


</project>
12 changes: 5 additions & 7 deletions ehealthid-rp/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -11,8 +9,8 @@
</parent>

<artifactId>ehealthid-rp</artifactId>
<description>Standalone OpenID connect relying party for Germany's eHealthID</description>
<packaging>jar</packaging>
<description>Standalone OpenID connect relying party for Germany's eHealthID</description>

<dependencies>
<dependency>
Expand Down Expand Up @@ -182,10 +180,10 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<phase>package</phase>
<configuration>
<includeScope>compile</includeScope>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
Expand All @@ -212,10 +210,10 @@
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
</execution>
</executions>

Expand All @@ -238,10 +236,10 @@
<executions>
<execution>
<id>check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
<configuration>
<rules>
<rule>
Expand Down
6 changes: 2 additions & 4 deletions ehealthid/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -126,10 +124,10 @@
<executions>
<execution>
<id>check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
<configuration>
<rules>
<rule>
Expand Down
102 changes: 48 additions & 54 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.oviva.ehealthid</groupId>
<artifactId>ehealthid-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>

<modules>
<module>ehealthid-cli</module>
<module>ehealthid-rp</module>
<module>ehealthid</module>
<module>reports</module>
</modules>

<scm>
<connection>scm:git:https://github.com/oviva-ag/ehealthid-relying-party.git</connection>
<url>https://github.com/oviva-ag/ehealthid-relying-party</url>
</scm>

<properties>
<maven.version>3.8.6</maven.version>

Expand All @@ -28,11 +47,9 @@
<version.handlebars>4.3.1</version.handlebars>

<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
<spotless-maven-plugin.google-java-format.version>1.18.1
</spotless-maven-plugin.google-java-format.version>
<spotless-maven-plugin.google-java-format.version>1.18.1</spotless-maven-plugin.google-java-format.version>
<jacoco.version>0.8.12</jacoco.version>


<maven-shade.version>3.5.2</maven-shade.version>

<sonar.organization>oviva-ag</sonar.organization>
Expand All @@ -42,32 +59,9 @@
<sonar.moduleKey>${project.groupId}_${project.artifactId}</sonar.moduleKey>
<sonar.cpd.exclusions></sonar.cpd.exclusions>
<sonar.coverage.exclusions>ehealthid-cli/**</sonar.coverage.exclusions>
<sonar.coverage.jacoco.xmlReportPaths>
${maven.multiModuleProjectDirectory}/reports/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/reports/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>

<scm>
<connection>scm:git:https://github.com/oviva-ag/ehealthid-relying-party.git</connection>
<url>https://github.com/oviva-ag/ehealthid-relying-party</url>
</scm>

<modules>
<module>ehealthid-cli</module>
<module>ehealthid-rp</module>
<module>ehealthid</module>
<module>reports</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -194,7 +188,6 @@
<version>5.4.0</version>
</dependency>


<!-- BEGIN wiremock // fix for broken dependency convergence & vulnerabilities -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -348,13 +341,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>enforce</id>
<phase>validate</phase>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<requireMavenVersion>
Expand All @@ -363,10 +363,10 @@
<reactorModuleConvergence>
<message>The reactor is not valid</message>
</reactorModuleConvergence>
<dependencyConvergence/>
<banDuplicatePomDependencyVersions/>
<banDependencyManagementScope/>
<banCircularDependencies/>
<dependencyConvergence></dependencyConvergence>
<banDuplicatePomDependencyVersions></banDuplicatePomDependencyVersions>
<banDependencyManagementScope></banDependencyManagementScope>
<banCircularDependencies></banCircularDependencies>
<bannedDependencies>
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
Expand All @@ -376,41 +376,37 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<configuration>
<java>
<removeUnusedImports/>
<removeUnusedImports></removeUnusedImports>
<googleJavaFormat>
<style>GOOGLE</style>
</googleJavaFormat>
</java>
<pom>
<sortPom></sortPom>
</pom>
</configuration>
<executions>
<execution>
<!-- Runs in compile phase to fail fast in case of formatting issues.-->
<id>spotless-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
<execution>
<!-- Runs in compile phase to fail fast in case of formatting issues.-->
<id>spotless-apply</id>
<phase>compile</phase>
<goals>
<goal>apply</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
Expand All @@ -429,37 +425,35 @@
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<phase>test</phase>
<configuration>
<dataFile>${project.build.directory}/jacoco.exec</dataFile>
<outputDirectory>${project.reporting.outputDirectory}/jacoco
</outputDirectory>
<outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<configuration>
</configuration>
<configuration></configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<phase>process-resources</phase>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
<phase>clean</phase>
</execution>
</executions>
</plugin>
Expand All @@ -469,10 +463,10 @@
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
Expand Down
7 changes: 2 additions & 5 deletions reports/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -33,15 +31,14 @@
<executions>
<execution>
<id>report-aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>


</project>

0 comments on commit 879be81

Please sign in to comment.