ENTAXY-248 release 1.8.1

This commit is contained in:
2022-02-28 15:20:38 +03:00
parent 4d274c4fcc
commit c826adf1db
1958 changed files with 195926 additions and 10280 deletions

411
pom.xml
View File

@ -5,17 +5,18 @@
<groupId>ru.entaxy.esb</groupId>
<artifactId>root</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<packaging>pom</packaging>
<name>ENTAXY :: ESB :: ROOT</name>
<description>ENTAXY :: ESB :: ROOT</description>
<modules>
<module>underlying</module>
<module>system</module>
<module>features</module>
<module>platform</module>
<!-- module>./distribution</module -->
<module>ui</module>
</modules>
<properties>
@ -28,18 +29,22 @@
<!-- @TODO consider import Karaf BOM to root/pom/dependencyManagement -->
<felix.configadmin.version>1.9.16</felix.configadmin.version>
<camel.version>3.4.4</camel.version>
<camel.version>3.4.5</camel.version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
<caffeine-version>2.8.4</caffeine-version>
<activemq.version>2.17.0</activemq.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<cxf.version>3.3.6</cxf.version>
<hibernate.version>5.2.17.Final</hibernate.version>
<jpa.version>2.1.0</jpa.version>
<aether.version>1.1.0</aether.version>
<cellar.version>4.2.1</cellar.version>
<spring.version>5.2.5.RELEASE_1</spring.version>
<spring.bundles.version>5.2.5.RELEASE_1</spring.bundles.version>
<spring.version>5.2.5.RELEASE</spring.version>
<mapstruct.version>1.3.1.Final</mapstruct.version>
<ignite.version>2.8.1</ignite.version>
<hazelcast.version>3.9.1</hazelcast.version>
<hazelcast.version>3.12.8</hazelcast.version>
<gson.version>2.8.5</gson.version>
<liquibase.version>3.6.3</liquibase.version>
<mssql.version>7.4.1.jre8</mssql.version>
@ -70,18 +75,29 @@
<jaxws-api.version>2.3.1</jaxws-api.version>
<javax.jws-api.version>1.1</javax.jws-api.version>
<jaxws.version>2.3.3</jaxws.version>
<!-- bundle settings -->
<bundle.osgi.import.pkg>*</bundle.osgi.import.pkg>
<bundle.osgi.private.pkg>{local-packages}</bundle.osgi.private.pkg>
<bundle.osgi.export.pkg/>
<bundle.osgi.dynamicimport.pkg/>
<bundle.osgi.export.service/>
<bundle.osgi.embed.dependency/>
<bundle.osgi.persistence/>
<bundle.osgi.remove.headers>Karaf-Commands</bundle.osgi.remove.headers>
<bundle.osgi.karaf.services.artifactInclude>.*</bundle.osgi.karaf.services.artifactInclude>
<!-- not used anymore -->
<bundle.osgi.activator/>
<!-- plugin versions -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
</properties>
<dependencyManagement>
@ -103,42 +119,12 @@
<type>pom</type>
</dependency>
<!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<artifactId>camel-bom</artifactId>
<version>${camel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-blueprint</artifactId>
<version>${camel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
<version>${camel.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
<version>${camel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
<version>${camel.version}</version>
<scope>provided</scope>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- JAXB for Java 11 -->
@ -240,9 +226,33 @@
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<!-- Karaf -->
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
<version>${karaf.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<!-- globally enable resource filtering -->
@ -290,7 +300,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>${maven-antrun-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-services-maven-plugin</artifactId>
<version>${karaf.version}</version>
</plugin>
<plugin>
<groupId>com.soebes.maven.plugins</groupId>
<artifactId>iterator-maven-plugin</artifactId>
<version>0.5.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@ -303,22 +338,45 @@
<configuration>
<obrRepository>NONE</obrRepository>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
<Export-Package>${bundle.osgi.export.pkg}</Export-Package>
<Import-Package>${bundle.osgi.import.pkg}</Import-Package>
<Private-Package>${bundle.osgi.private.pkg}</Private-Package>
<DynamicImport-Package>${bundle.osgi.dynamicimport.pkg}</DynamicImport-Package>
<Export-Service/>
<Embed-Dependency>${bundle.osgi.embed.dependency}</Embed-Dependency>
<Meta-Persistence>${bundle.osgi.persistence}</Meta-Persistence>
<Bundle-Activator>${bundle.osgi.activator}</Bundle-Activator>
<!-- breaks @Services annotation-based manifest generation -->
<!-- Bundle-Activator>${bundle.osgi.activator}</Bundle-Activator -->
<!-- BND instruction to remove headers from manifest -->
<!-- by default we remove "Karaf-Commands" header -->
<_removeheaders>${bundle.osgi.remove.headers}</_removeheaders>
</instructions>
</configuration>
</plugin>
<!-- support for @Services annotation and annotations related to shell commands -->
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-services-maven-plugin</artifactId>
<executions>
<execution>
<id>service-metadata-generate</id>
<phase>process-classes</phase>
<goals>
<goal>service-metadata-generate</goal>
</goals>
<configuration>
<artifactInclude>${bundle.osgi.karaf.services.artifactInclude}</artifactInclude>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@ -348,7 +406,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -357,7 +414,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<!-- CICD stuff -->
@ -517,7 +573,7 @@
<profile>
<id>features</id>
<build>
<resources>
<!-- resources>
<resource>
<directory>src/main/features</directory>
<filtering>true</filtering>
@ -526,12 +582,35 @@
</includes>
<targetPath>${project.build.directory}/features</targetPath>
</resource>
</resources>
</resources -->
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-features</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/features</outputDirectory>
<resources>
<resource>
<directory>src/main/features</directory>
<filtering>true</filtering>
<includes>
<include>**/features.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version>
<executions>
<execution>
<id>attach-features</id>
@ -624,7 +703,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>assebmly</id>
@ -717,7 +795,9 @@
<projectName>${license.projectName}</projectName>
<copyrightOwners>${license.copyrightOwners}</copyrightOwners>
<licenseName>${license.licenseName}</licenseName>
<keepBackup>false</keepBackup>
<bundleLicensePath>META-INF/LICENSE</bundleLicensePath>
<generateBundle>true</generateBundle>
</configuration>
@ -745,7 +825,7 @@
<excludedGroups>^ru\.entaxy\.esb</excludedGroups>
<licenseMerges>
<licenseMerge>Apache License, Version 2.0|The Apache Software License, Version 2.0|The Apache License, Version 2.0|Apache 2.0 License|Apache 2.0</licenseMerge>
<licenseMerge>Apache License, Version 2.0|The Apache Software License, Version 2.0|The Apache License, Version 2.0|Apache 2.0 License|Apache 2.0|Apache-2.0</licenseMerge>
<licenseMerge>EDL 1.0|Eclipse Distribution License v. 1.0|Eclipse Distribution License - v 1.0</licenseMerge>
<licenseMerge>EPL 2.0|Eclipse Public License v. 2.0</licenseMerge>
<licenseMerge>EPL 1.0|Eclipse Public License v. 1.0|Eclipse Public License v1.0</licenseMerge>
@ -779,6 +859,8 @@
<excludes>
<exclude>**/*.json</exclude>
<!-- *.ftl files will be processed by the next plugin -->
<exclude>**/*.ftl</exclude>
</excludes>
<extraExtensions>
<!-- treat *.cfg files as *.properties -->
@ -786,7 +868,7 @@
</extraExtensions>
<ignoreNoFileToScan>true</ignoreNoFileToScan>
<keepBackup>true</keepBackup>
<keepBackup>false</keepBackup>
<processStartTag>${license.processStartTag}</processStartTag>
<processEndTag>${license.processEndTag}</processEndTag>
@ -795,6 +877,57 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<executions>
<execution>
<id>update-ftl-header</id>
<goals>
<goal>format</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<properties>
<owner>EmDev LLC</owner>
<email>entaxy@entaxy.ru</email>
<year>2021</year>
</properties>
<licenseSets>
<licenseSet>
<!-- header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header -->
<inlineHeader>~~~~~~licensing~~~~~~
${project.artifactId}
==========
Copyright (C) 2020 - ${year} ${owner}
==========
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.
~~~~~~/licensing~~~~~~</inlineHeader>
<includes>
<include>**/*.ftl</include>
</includes>
</licenseSet>
</licenseSets>
<mapping>
<ftl>FTL_ALT</ftl>
</mapping>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@ -814,7 +947,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.0.0</version>
<executions>
<!-- collect all the dependencies through all the underlying modules
-->
@ -853,10 +985,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<!--
@TODO remove version after moving plugins declarations from distribution/pom.xml to root/pom.xml
-->
<version>3.2.0</version>
<executions>
<execution>
<id>attach-dependencies</id>
@ -882,6 +1010,177 @@
</profile>
<profile>
<id>attach-healthchecks</id>
<activation>
<file>
<exists>src/main/healthcheck</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-healthchecks</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/healthcheck</outputDirectory>
<resources>
<resource>
<directory>src/main/healthcheck</directory>
<filtering>true</filtering>
<includes>
<include>*.*</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>collect-healthckeck-configs</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<pathconvert property="file.list.tmp">
<fileset dir="${project.build.directory}/healthcheck">
<include name="*.*"></include>
</fileset>
</pathconvert>
<!-- echo>[file.list.tmp] ${file.list.tmp}</echo -->
<echo file="${project.build.directory}/tmp/files">${file.list.tmp}</echo>
<replace file="${project.build.directory}/tmp/files"
token="\"
value="\\\\" />
<loadfile property="file.list" srcFile="${project.build.directory}/tmp/files"/>
<delete file="src/main/healthcheck/generated/fragments.xml" />
</target>
</configuration>
</execution>
<!-- TO REMOVE -->
<!-- execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo>Displaying value of 'file.list' property</echo>
<echo>[file.list] ${file.list}</echo>
</target>
</configuration>
</execution -->
</executions>
</plugin>
<plugin>
<groupId>com.soebes.maven.plugins</groupId>
<artifactId>iterator-maven-plugin</artifactId>
<executions>
<execution>
<id>iterate-healthcheck-configs</id>
<phase>package</phase>
<goals>
<goal>iterator</goal>
</goals>
<configuration>
<content>${file.list}</content>
<delimiter>${path.separator}</delimiter>
<pluginExecutors>
<pluginExecutor>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
<goal>run</goal>
<configuration>
<target>
<property name="item.current">@item@</property>
<basename property="filename.full" file="${item.current}" suffix=".cfg"/>
<echo file="${project.build.directory}/tmp/properties">filename.current=${filename.full}</echo>
<echo file="src/main/healthcheck/generated/fragments.xml" append="true">
<![CDATA[
<!-- -->
<configfile finalname="${karaf.etc}/${filename.full}.cfg" override="true">
mvn:${project.groupId}/${project.artifactId}/${project.version}/cfg/${filename.full}
</configfile>
<!-- -->
]]>
</echo>
</target>
</configuration>
</pluginExecutor>
<pluginExecutor>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
</plugin>
<goal>read-project-properties</goal>
<configuration>
<files>
<file>${project.build.directory}/tmp/properties</file>
</files>
</configuration>
</pluginExecutor>
<!-- TO REMOVE -->
<!-- pluginExecutor>
<plugin>
<groupId>com.soebes.maven.plugins</groupId>
<artifactId>maven-echo-plugin</artifactId>
<version>0.1</version>
</plugin>
<goal>echo</goal>
<configuration>
<echos>
<echo>This is a message: @item@</echo>
<echo>This is a message: ${filename.current}</echo>
</echos>
</configuration>
</pluginExecutor -->
<pluginExecutor>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
<goal>attach-artifact</goal>
<configuration>
<artifacts>
<artifact>
<file>src/main/healthcheck/${filename.current}.cfg</file>
<type>cfg</type>
<classifier>${filename.current}</classifier>
</artifact>
</artifacts>
</configuration>
</pluginExecutor>
</pluginExecutors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- TODO Imrove it!!! -->
<organization>