diff --git a/haiti-bom/pom.xml b/haiti-bom/pom.xml index 57c876d..c15e7d6 100644 --- a/haiti-bom/pom.xml +++ b/haiti-bom/pom.xml @@ -6,38 +6,51 @@ dev.struchkov.haiti haiti-bom - 0.0.2 + 0.0.3 pom Haiti BOM Current versions of the framework dependencies https://github.com/haiti-projects/haiti-framework + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + GitHub + https://github.com/haiti-projects/haiti-framework/issues + - true + false + 11 - 11 - 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 - 4.1.0 - 2.4.0 - 2.4.0 + 4.3.1 + 2.6.1 + 2.6.1 2.2 - 7.9.3 + 7.16.3 1.18.22 - 1.7.32 + 1.7.33 1.6.8 - 3.8.0 + 3.9.0 3.2.1 3.3.1 3.0.1 @@ -50,37 +63,31 @@ haiti-exception ${haiti.exception.ver} - dev.struchkov.haiti haiti-context ${haiti.exception.ver} - dev.struchkov.haiti haiti-context ${haiti.context.ver} - dev.struchkov.haiti haiti-core ${haiti.core.ver} - dev.struchkov.haiti haiti-filter ${haiti.filter.api.ver} - dev.struchkov.haiti.filter haiti-filter-criteria ${haiti.filter.criteria.ver} - dev.struchkov.haiti haiti-utils @@ -133,15 +140,54 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.maven.compiler.ver} + + 11 + 11 + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${plugin.nexus.staging.ver} + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.maven.source.ver} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${plugin.maven.javadoc.ver} + + + org.apache.maven.plugins + maven-gpg-plugin + ${plugin.maven.gpg.ver} + + + + + release + org.sonatype.plugins nexus-staging-maven-plugin - ${plugin.nexus.staging.ver} true ossrh @@ -153,7 +199,6 @@ org.apache.maven.plugins maven-source-plugin - ${plugin.maven.source.ver} attach-sources @@ -166,7 +211,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${plugin.maven.javadoc.ver} attach-javadocs @@ -179,7 +223,6 @@ org.apache.maven.plugins maven-gpg-plugin - ${plugin.maven.gpg.ver} sign-artifacts @@ -195,20 +238,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - ${plugin.maven.compiler.ver} - - 11 - 11 - - - - - scm:git:https://github.com/haiti-projects/haiti-framework.git https://github.com/haiti-projects/haiti-framework @@ -231,27 +260,4 @@ - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 the original author or authors. - - 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 - - https://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. - - - - \ No newline at end of file diff --git a/haiti-context/pom.xml b/haiti-context/pom.xml index cd87faf..85a392c 100644 --- a/haiti-context/pom.xml +++ b/haiti-context/pom.xml @@ -6,17 +6,24 @@ dev.struchkov.haiti haiti - 0.0.2 + 0.0.3 haiti-context ${haiti.context.ver} Haiti Context - Basic framework classes + Basic framework general classes + https://github.com/haiti-projects/haiti-framework false + + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -43,13 +50,4 @@ - - - uPagge - Struchkov Mark - mark@struchkov.dev - https://mark.struchkov.dev - - - \ No newline at end of file diff --git a/haiti-core/pom.xml b/haiti-core/pom.xml index 0a1a91a..7caaf65 100644 --- a/haiti-core/pom.xml +++ b/haiti-core/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.haiti haiti - 0.0.2 + 0.0.3 haiti-core @@ -14,9 +14,16 @@ Haiti Core Implementation of the main classes of the framework + https://github.com/haiti-projects/haiti-framework false + + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -48,13 +55,4 @@ - - - uPagge - Struchkov Mark - mark@struchkov.dev - https://mark.struchkov.dev - - - \ No newline at end of file diff --git a/haiti-exception/pom.xml b/haiti-exception/pom.xml index 7454359..f0a1919 100644 --- a/haiti-exception/pom.xml +++ b/haiti-exception/pom.xml @@ -5,7 +5,7 @@ haiti dev.struchkov.haiti - 0.0.2 + 0.0.3 4.0.0 @@ -14,9 +14,15 @@ Haiti Exception General exceptions for the haiti project + https://github.com/haiti-projects/haiti-framework false + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -31,13 +37,4 @@ - - - uPagge - Struchkov Mark - mark@struchkov.dev - https://mark.struchkov.dev - - - \ No newline at end of file diff --git a/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java b/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java index fe6f4b7..6b8488a 100644 --- a/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java +++ b/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java @@ -1,5 +1,8 @@ package dev.struchkov.haiti.context.exception; +import java.text.MessageFormat; +import java.util.function.Supplier; + /** * Исключение при конвертации. */ @@ -13,4 +16,8 @@ public class ConvertException extends BasicException { super(message, cause); } + public static Supplier supplier(String message, Object... objects) { + return () -> new ConvertException(MessageFormat.format(message, objects)); + } + } diff --git a/haiti-filter/pom.xml b/haiti-filter/pom.xml index 7c69f9e..b14c2dc 100644 --- a/haiti-filter/pom.xml +++ b/haiti-filter/pom.xml @@ -6,18 +6,24 @@ dev.struchkov.haiti haiti - 0.0.2 + 0.0.3 haiti-filter ${haiti.filter.api.ver} - jar Haiti Filter Fast and convenient filtering requests to data warehouses. + https://github.com/haiti-projects/haiti-framework false + + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -44,13 +50,4 @@ - - - uPagge - Struchkov Mark - mark@struchkov.dev - https://mark.struchkov.dev - - - \ No newline at end of file diff --git a/haiti-utils/pom.xml b/haiti-utils/pom.xml index aad56d4..5a36f85 100644 --- a/haiti-utils/pom.xml +++ b/haiti-utils/pom.xml @@ -5,18 +5,25 @@ dev.struchkov.haiti haiti - 0.0.2 + 0.0.3 4.0.0 Haiti Utils Utility useful things + https://github.com/haiti-projects/haiti-framework haiti-utils ${haiti.utils.ver} false + + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -43,13 +50,4 @@ - - - uPagge - Struchkov Mark - mark@struchkov.dev - https://mark.struchkov.dev - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 62a75cf..a309a68 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,23 @@ dev.struchkov.haiti haiti - 0.0.2 + ${haiti.ver} pom + Haiti Framework + Fast development to keep time on the beach + https://github.com/haiti-projects/haiti-framework + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + GitHub + https://github.com/haiti-projects/haiti-framework/issues + + haiti-context haiti-core @@ -18,19 +32,22 @@ haiti-exception - Haiti Framework - Fast development to keep time on the beach - https://github.com/haiti-projects/haiti-framework - - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 - 0.0.2 + 11 + ${java.version} + ${java.version} + UTF-8 + UTF-8 + + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 + 0.0.3 1.6.8 3.2.1 @@ -38,30 +55,12 @@ 3.0.1 - - scm:git:https://github.com/haiti-projects/haiti-framework.git - https://github.com/haiti-projects/haiti-framework - scm:git:https://github.com/haiti-projects/haiti-framework.git - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - - - GitHub - https://github.com/haiti-projects/haiti-framework/issues - - dev.struchkov.haiti haiti-bom - 0.0.2 + 0.0.3 pom import @@ -169,42 +168,26 @@ + + scm:git:https://github.com/haiti-projects/haiti-framework.git + https://github.com/haiti-projects/haiti-framework + scm:git:https://github.com/haiti-projects/haiti-framework.git + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + uPagge Struchkov Mark mark@struchkov.dev - Struchkov Inc. - https://struchkov.dev https://mark.struchkov.dev - - Project Lead - - +3 - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 the original author or authors. - - 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 - - https://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. - - - - \ No newline at end of file