Skip to content

Commit

Permalink
Clean pom.xml, */pom.xml
Browse files Browse the repository at this point in the history 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
@stweil
stweil committed Aug 30, 2024
1 parent db3dd97 commit 2289209
Show file tree
Hide file tree
Showing 14 changed files with 186 additions and 176 deletions.
1 change: 1 addition & 0 deletions Kitodo-API/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - API</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-api</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-Command/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Command</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-command</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-DataEditor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</parent>

<name>Kitodo - Data Editor</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-data-editor</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-DataFormat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</parent>

<name>Kitodo - Data Format</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-data-format</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-DataManagement/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Data Management</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-data-management</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-Docket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Docket</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-docket</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-FileManagement/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - File Management</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-file-management</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-ImageManagement/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Image Management</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-image-management</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-LongTermPreservationValidation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Long Term Preservation Validation</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-longtermpreservation-validation</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-PersistentIdentifier/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<name>Kitodo - Persistent Identifier</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-persistentidentifier</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-Query-URL-Import/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</parent>

<name>Kitodo - Query URL Import</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-query-url-import</artifactId>

<properties>
Expand Down
1 change: 1 addition & 0 deletions Kitodo-XML-SchemaConverter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</parent>

<name>Kitodo - XML SchemaConverter</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo-xml-schemaconverter</artifactId>

<properties>
Expand Down
105 changes: 53 additions & 52 deletions Kitodo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@
<version>3.8.0-SNAPSHOT</version>
</parent>

<name>Kitodo - Core</name>
<groupId>org.kitodo</groupId>
<artifactId>kitodo</artifactId>
<packaging>war</packaging>
<name>Kitodo - Core</name>

<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
Expand Down Expand Up @@ -435,8 +436,8 @@
that means first entry will be added as last resource and may override other resources -->
<resource>
<!-- ATTENTION! This config is only loaded in all-tests and selenium profile with specified path-->
<directory>${build.resources.path}</directory>
<filtering>true</filtering>
<directory>${build.resources.path}</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
Expand Down Expand Up @@ -474,9 +475,6 @@
<profiles>
<profile>
<id>all-tests</id>
<properties>
<build.resources.path>src/test/resources</build.resources.path>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -494,6 +492,9 @@
</plugin>
</plugins>
</build>
<properties>
<build.resources.path>src/test/resources</build.resources.path>
</properties>
</profile>

<profile>
Expand Down Expand Up @@ -539,6 +540,25 @@
<artifactId>cargo-maven3-plugin</artifactId>
<version>${cargo.plugin.version}</version>

<executions>
<!-- start Tomcat -->
<execution>
<id>start-container</id>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<!-- stop Tomcat -->
<execution>
<id>stop-container</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>

<configuration>
<!-- Provide Tomcat -->
<container>
Expand All @@ -562,25 +582,6 @@
</deployable>
</deployables>
</configuration>

<executions>
<!-- start Tomcat -->
<execution>
<id>start-container</id>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<!-- stop Tomcat -->
<execution>
<id>stop-container</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand Down Expand Up @@ -647,6 +648,25 @@
<artifactId>cargo-maven3-plugin</artifactId>
<version>${cargo.plugin.version}</version>

<executions>
<!-- start Tomcat -->
<execution>
<id>start-container</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<!-- stop Tomcat -->
<execution>
<id>stop-container</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>

<configuration>
<!-- Provide Tomcat -->
<container>
Expand All @@ -670,32 +690,23 @@
</deployable>
</deployables>
</configuration>
</plugin>

<plugin>
<!-- Run tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- start Tomcat -->
<execution>
<id>start-container</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<!-- stop Tomcat -->
<execution>
<id>stop-container</id>
<phase>post-integration-test</phase>
<phase>integration-test</phase>
<goals>
<goal>stop</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<!-- Run tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<configuration>
<excludes>
<exclude>**/*IT.java</exclude>
Expand All @@ -705,16 +716,6 @@
<include>**/*ST.java</include>
</includes>
</configuration>

<executions>
<execution>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 2289209

Please sign in to comment.