Compare commits
6 Commits
feature/ja
...
12c1ff879b
| Author | SHA1 | Date | |
|---|---|---|---|
| 12c1ff879b | |||
| db42afb4da | |||
| 954444bdfc | |||
| fc81092752 | |||
| 613a74ca92 | |||
| b9482de3b1 |
@ -1,5 +0,0 @@
|
|||||||
@ECHO OFF
|
|
||||||
setlocal
|
|
||||||
set BASEPATH=%~dp0%
|
|
||||||
cd %BASEPATH%\..
|
|
||||||
mvn release:clean release:prepare -Dmaven.test.skip=true -Darguments="-Dmaven.test.skip=true -DskipTests"
|
|
||||||
@ -21,7 +21,7 @@ limitations under the License.
|
|||||||
|
|
||||||
<groupId>de.muehlencord.shared</groupId>
|
<groupId>de.muehlencord.shared</groupId>
|
||||||
<artifactId>shared-db</artifactId>
|
<artifactId>shared-db</artifactId>
|
||||||
<packaging>ejb</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>shared</artifactId>
|
<artifactId>shared</artifactId>
|
||||||
|
|||||||
@ -26,7 +26,7 @@ limitations under the License.
|
|||||||
|
|
||||||
<groupId>de.muehlencord.shared</groupId>
|
<groupId>de.muehlencord.shared</groupId>
|
||||||
<artifactId>shared-jeeutil</artifactId>
|
<artifactId>shared-jeeutil</artifactId>
|
||||||
<packaging>ejb</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>shared-jeeutil</name>
|
<name>shared-jeeutil</name>
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright 2019 Joern Muehlencord (joern@muehlencord.de).
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<project-shared-configuration>
|
|
||||||
<!--
|
|
||||||
This file contains additional configuration written by modules in the NetBeans IDE.
|
|
||||||
The configuration is intended to be shared among all the users of project and
|
|
||||||
therefore it is assumed to be part of version control checkout.
|
|
||||||
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
|
|
||||||
-->
|
|
||||||
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
|
|
||||||
<!--
|
|
||||||
Properties that influence various parts of the IDE, especially code formatting and the like.
|
|
||||||
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
|
|
||||||
That way multiple projects can share the same settings (useful for formatting rules for example).
|
|
||||||
Any value defined here will override the pom.xml file value but is only applicable to the current project.
|
|
||||||
-->
|
|
||||||
<netbeans.compile.on.save>all</netbeans.compile.on.save>
|
|
||||||
</properties>
|
|
||||||
</project-shared-configuration>
|
|
||||||
@ -16,29 +16,36 @@ 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">
|
<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">
|
||||||
<artifactId>shared-network</artifactId>
|
<artifactId>shared-network</artifactId>
|
||||||
|
|
||||||
<build>
|
<groupId>de.muehlencord.shared</groupId>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
</build>
|
<name>shared-network</name>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<artifactId>shared</artifactId>
|
||||||
|
<groupId>de.muehlencord</groupId>
|
||||||
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<url>http://maven.apache.org</url>
|
||||||
|
|
||||||
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<artifactId>slf4j-jdk14</artifactId>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<artifactId>shared-util</artifactId>
|
<artifactId>shared-util</artifactId>
|
||||||
<groupId>de.muehlencord.shared</groupId>
|
<groupId>de.muehlencord.shared</groupId>
|
||||||
<type>jar</type>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -60,25 +67,22 @@ limitations under the License.
|
|||||||
<artifactId>jaxws-api</artifactId>
|
<artifactId>jaxws-api</artifactId>
|
||||||
<groupId>javax.xml.ws</groupId>
|
<groupId>javax.xml.ws</groupId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<version>2.3.1</version>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- Test -->
|
||||||
|
<dependency>
|
||||||
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<artifactId>slf4j-jdk14</artifactId>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<groupId>de.muehlencord.shared</groupId>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<name>shared-network</name>
|
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<build>
|
||||||
|
<finalName>${project.artifactId}</finalName>
|
||||||
<parent>
|
</build>
|
||||||
<artifactId>shared</artifactId>
|
|
||||||
<groupId>de.muehlencord</groupId>
|
|
||||||
<version>2.0.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<version>2.0.0-SNAPSHOT</version>
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
70
pom.xml
70
pom.xml
@ -18,6 +18,7 @@ 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">
|
<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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>de.muehlencord</groupId>
|
||||||
<artifactId>shared</artifactId>
|
<artifactId>shared</artifactId>
|
||||||
<version>2.0.0-SNAPSHOT</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
<name>shared</name>
|
<name>shared</name>
|
||||||
@ -54,17 +55,24 @@ limitations under the License.
|
|||||||
<url>https://jomu.timelord.de/git/jomu/shared/</url>
|
<url>https://jomu.timelord.de/git/jomu/shared/</url>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>gitea</id>
|
||||||
|
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
<id>ossrh</id>
|
<id>jomu-gitea</id>
|
||||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
|
||||||
</repository>
|
</repository>
|
||||||
<snapshotRepository>
|
<snapshotRepository>
|
||||||
<id>ossrh</id>
|
<id>jomu-gitea</id>
|
||||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
|
||||||
</snapshotRepository>
|
</snapshotRepository>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
<groupId>de.muehlencord</groupId>
|
|
||||||
|
|
||||||
<issueManagement>
|
<issueManagement>
|
||||||
<system>Gitea</system>
|
<system>Gitea</system>
|
||||||
@ -79,24 +87,25 @@ limitations under the License.
|
|||||||
<maven.compiler.release>17</maven.compiler.release>
|
<maven.compiler.release>17</maven.compiler.release>
|
||||||
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<slf4j.version>2.0.6</slf4j.version>
|
<slf4j.version>2.0.9</slf4j.version>
|
||||||
<jackson.version>2.14.2</jackson.version>
|
<jackson.version>2.16.0</jackson.version>
|
||||||
<lombok.version>1.18.26</lombok.version>
|
<lombok.version>1.18.30</lombok.version>
|
||||||
<junit.version>5.9.2</junit.version>
|
<junit.version>5.10.1</junit.version>
|
||||||
|
|
||||||
<poi.version>5.2.3</poi.version>
|
<poi.version>5.2.5</poi.version>
|
||||||
<commons-net.version>3.9.0</commons-net.version>
|
<commons-net.version>3.10.0</commons-net.version>
|
||||||
<commons-lang.version>3.12.0</commons-lang.version>
|
<commons-lang.version>3.14.0</commons-lang.version>
|
||||||
<gson.version>2.10.1</gson.version>
|
<gson.version>2.10.1</gson.version>
|
||||||
<fusionauth.version>5.2.2</fusionauth.version>
|
<fusionauth.version>5.3.1</fusionauth.version>
|
||||||
<bouncycastle.version>1.70</bouncycastle.version>
|
<bouncycastle.version>1.70</bouncycastle.version>
|
||||||
<hibernate.version>6.1.7.Final</hibernate.version>
|
<hibernate.version>6.2.15.Final</hibernate.version>
|
||||||
<com-sun-mail.version>1.6.2</com-sun-mail.version>
|
<com-sun-mail.version>1.6.2</com-sun-mail.version>
|
||||||
|
|
||||||
<jakarta-faces.version>4.0.4</jakarta-faces.version>
|
<jakarta-faces.version>4.0.5</jakarta-faces.version>
|
||||||
<joinfaces.version>5.1.4</joinfaces.version>
|
<joinfaces.version>5.1.6</joinfaces.version>
|
||||||
<jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
|
<jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
|
||||||
<jakarta-inject-api.version>2.0.0</jakarta-inject-api.version>
|
<jakarta-inject-api.version>2.0.1</jakarta-inject-api.version>
|
||||||
|
<jaxws-api.version>2.3.1</jaxws-api.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
@ -206,6 +215,11 @@ limitations under the License.
|
|||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
<version>${jackson.version}</version>
|
<version>${jackson.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<artifactId>jaxws-api</artifactId>
|
||||||
|
<groupId>javax.xml.ws</groupId>
|
||||||
|
<version>${jaxws-api.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<artifactId>scrypt</artifactId>
|
<artifactId>scrypt</artifactId>
|
||||||
@ -258,17 +272,17 @@ limitations under the License.
|
|||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!-- deploy artifacts to maven repository -->
|
<!-- deploy artifacts to maven repository -->
|
||||||
<plugin>
|
<!-- <plugin>-->
|
||||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
<!-- <artifactId>nexus-staging-maven-plugin</artifactId>-->
|
||||||
<configuration>
|
<!-- <configuration>-->
|
||||||
<autoReleaseAfterClose>true</autoReleaseAfterClose>
|
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
|
||||||
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
|
<!-- <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
|
||||||
<serverId>ossrh</serverId>
|
<!-- <serverId>ossrh</serverId>-->
|
||||||
</configuration>
|
<!-- </configuration>-->
|
||||||
<extensions>true</extensions>
|
<!-- <extensions>true</extensions>-->
|
||||||
<groupId>org.sonatype.plugins</groupId>
|
<!-- <groupId>org.sonatype.plugins</groupId>-->
|
||||||
<version>1.6.8</version>
|
<!-- <version>1.6.8</version>-->
|
||||||
</plugin>
|
<!-- </plugin>-->
|
||||||
|
|
||||||
<!-- ensure sources are build so they are also uploaded -->
|
<!-- ensure sources are build so they are also uploaded -->
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
Reference in New Issue
Block a user