Compare commits

..

No commits in common. "919bb5ae1bc908832f5089ec7c610e4c0cad1ad7" and "d05855c2be74e6b3b5f6b1d5115a47c2677bd6a0" have entirely different histories.

3 changed files with 19 additions and 24 deletions

View File

@ -1,10 +1,12 @@
<?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>
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>haiti-exception</artifactId>

View File

@ -1,10 +1,12 @@
<?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>
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
</parent>
<name>Haiti Utils</name>

31
pom.xml
View File

@ -1,10 +1,12 @@
<?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>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Haiti Framework</name>
@ -33,6 +35,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<haiti.ver>${project.version}</haiti.ver>
<haiti.exception.ver>${haiti.ver}</haiti.exception.ver>
<haiti.context.ver>${haiti.ver}</haiti.context.ver>
<javax.persistence.api.version>2.2</javax.persistence.api.version>
<google.auto.service.version>1.0.1</google.auto.service.version>
<slf4j.api.version>2.0.6</slf4j.api.version>
@ -42,7 +48,6 @@
<plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
<plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver>
<plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
</properties>
<dependencyManagement>
@ -50,12 +55,12 @@
<dependency>
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-exception</artifactId>
<version>${project.version}</version>
<version>${haiti.exception.ver}</version>
</dependency>
<dependency>
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-utils</artifactId>
<version>${project.version}</version>
<version>${haiti.utils.ver}</version>
</dependency>
<dependency>
@ -134,19 +139,6 @@
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${plugin.maven.release.ver}</version>
<configuration>
<preparationGoals>clean install</preparationGoals>
<tagNameFormat>v.@{project.version}</tagNameFormat>
<autoVersionSubmodules>true</autoVersionSubmodules>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
<signTag>true</signTag>
</configuration>
</plugin>
</plugins>
</pluginManagement>
@ -296,8 +288,7 @@
<connection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</connection>
<url>https://git.struchkov.dev/Haiti/haiti-framework</url>
<developerConnection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</developerConnection>
<tag>HEAD</tag>
</scm>
</scm>
<developers>
<developer>