Skip to content

Commit

Permalink
Merge pull request 'pom.xml: really fix maven version configuration t…
Browse files Browse the repository at this point in the history
…his time, hopefully' (#5) from release_1.1.2 into master

Reviewed-on: https://gitea.intranda.com/intranda/goobi-vocabulary-server/pulls/5
  • Loading branch information
Dominick Leppich committed Sep 5, 2024
2 parents 8cfde6d + 50e0c2e commit e0edeba
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 4 deletions.
25 changes: 23 additions & 2 deletions module-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>io.goobi.vocabulary</groupId>
<artifactId>vocabulary-server-core</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>Vocabulary-Server-Core</name>
<description>Spring Boot based RESTful web service for vocabulary management</description>
<packaging>jar</packaging>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>io.goobi.vocabulary</groupId>
<artifactId>vocabulary-server-exchange</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -162,6 +162,21 @@
</configuration>
</plugin>

<!-- COMPILATION -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
<arg>-Xlint:deprecation</arg>
<arg>-Xlint:unchecked</arg>
<arg>-Xlint:removal</arg>
</compilerArgs>
</configuration>
</plugin>
<!-- COMPILATION -->

<!-- TEST COVERAGE -->
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -226,6 +241,9 @@
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.version}</version>
</requireMavenVersion>
<requireReleaseVersion>
<message>This is not a release version!</message>
</requireReleaseVersion>
Expand Down Expand Up @@ -259,6 +277,9 @@
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.version}</version>
</requireMavenVersion>
<requireSnapshotVersion>
<message>This is not a snapshot version!</message>
<failWhenParentIsRelease>false</failWhenParentIsRelease>
Expand Down
23 changes: 22 additions & 1 deletion module-exchange/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.goobi.vocabulary</groupId>
<artifactId>vocabulary-server-exchange</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>Vocabulary Exchange</name>
<description>Vocabulary data exchange classes</description>
<packaging>jar</packaging>
Expand Down Expand Up @@ -41,6 +41,21 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<!-- COMPILATION -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
<arg>-Xlint:deprecation</arg>
<arg>-Xlint:unchecked</arg>
<arg>-Xlint:removal</arg>
</compilerArgs>
</configuration>
</plugin>
<!-- COMPILATION -->

<!-- TEST COVERAGE -->
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -105,6 +120,9 @@
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.version}</version>
</requireMavenVersion>
<requireReleaseVersion>
<message>This is not a release version!</message>
</requireReleaseVersion>
Expand Down Expand Up @@ -138,6 +156,9 @@
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.version}</version>
</requireMavenVersion>
<requireSnapshotVersion>
<message>This is not a snapshot version!</message>
<failWhenParentIsRelease>false</failWhenParentIsRelease>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.goobi.vocabulary</groupId>
<artifactId>vocabulary-server</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>Vocabulary-Server</name>
<packaging>pom</packaging>
<description>RESTful webservice for vocabulary management</description>
Expand Down

0 comments on commit e0edeba

Please sign in to comment.