Merge branch 'develop' into feature/jakrtaee10

# Conflicts:
#	configuration/pom.xml
#	db/pom.xml
#	jeeutil/pom.xml
#	network/pom.xml
#	poi-util/pom.xml
#	pom.xml
#	util/pom.xml
This commit is contained in:
Joern Muehlencord
2024-02-15 23:52:57 +01:00
11 changed files with 207 additions and 245 deletions

20
pom.xml
View File

@ -18,8 +18,9 @@ limitations under the License.
<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>de.muehlencord</groupId>
<artifactId>shared</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-SNAPSHOT</version>
<name>shared</name>
<packaging>pom</packaging>
@ -54,17 +55,24 @@ limitations under the License.
<url>https://jomu.timelord.de/git/jomu/shared/</url>
</scm>
<repositories>
<repository>
<id>gitea</id>
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>jomu-gitea</id>
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>jomu-gitea</id>
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
</snapshotRepository>
</distributionManagement>
<groupId>de.muehlencord</groupId>
<issueManagement>
<system>Gitea</system>