- change version on 1.8
- add docker-compose - update entaxy
This commit is contained in:
175
pom.xml
175
pom.xml
@ -36,13 +36,21 @@
|
||||
<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>
|
||||
<mapstruct.version>1.3.1.Final</mapstruct.version>
|
||||
<ignite.version>2.8.1</ignite.version>
|
||||
<hazelcast.version>3.9.1</hazelcast.version>
|
||||
<gson.version>2.8.5</gson.version>
|
||||
<liquibase.version>3.6.3</liquibase.version>
|
||||
<mssql.version>7.4.1.jre8</mssql.version>
|
||||
<postgresql.version>42.2.5</postgresql.version>
|
||||
<!-- postgresql.version>42.2.5</postgresql.version -->
|
||||
<!--
|
||||
version should be 42.2.7 or higher
|
||||
to avoid
|
||||
java.lang.ClassNotFoundException: javax.security.sasl.SaslException not found by org.postgresql.jdbc42
|
||||
see https://github.com/pgjdbc/pgjdbc/issues/1503
|
||||
-->
|
||||
<postgresql.version>42.2.9</postgresql.version>
|
||||
<slf4j.version>1.7.30</slf4j.version>
|
||||
<javax.transaction.version>1.2</javax.transaction.version>
|
||||
<javax.interceptor.version>1.2</javax.interceptor.version>
|
||||
@ -267,11 +275,6 @@
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>${maven-deploy-plugin.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>license-maven-plugin</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
@ -281,7 +284,7 @@
|
||||
<version>${maven-bundle-plugin.version}</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<obrRepository>NONE</obrRepository>
|
||||
<obrRepository>NONE</obrRepository>
|
||||
<instructions>
|
||||
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
|
||||
<Bundle-Description>${project.description}</Bundle-Description>
|
||||
@ -356,7 +359,7 @@
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.codehaus.mojo</groupId>-->
|
||||
<!-- <artifactId>build-helper-maven-plugin</artifactId>-->
|
||||
<!-- <version>1.8</version>-->
|
||||
<!-- <version>1.8.0</version>-->
|
||||
<!-- <inherited>false</inherited>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
@ -374,7 +377,7 @@
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-antrun-plugin</artifactId>-->
|
||||
<!-- <version>1.8</version>-->
|
||||
<!-- <version>1.8.0</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <inherited>false</inherited>-->
|
||||
@ -442,7 +445,7 @@
|
||||
<!-- url>http://localhost:8981/repository/entaxy-public-entaxy/</url -->
|
||||
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
|
||||
</repository>
|
||||
<!-- we use the same repository for releases & snapshots -->
|
||||
<!-- we don't publish snapshots -->
|
||||
<!-- snapshotRepository>
|
||||
<id>entaxy-private-snapshots</id>
|
||||
<name>entaxy-private-snapshots</name>
|
||||
@ -475,8 +478,12 @@
|
||||
<profile>
|
||||
<id>docker.reposilite</id>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>local-reposilte-releases</id>
|
||||
<url>http://127.0.0.1:8081/releases</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>entaxy-maven-repo</id>
|
||||
<id>local-reposilte-snapshots</id>
|
||||
<url>http://127.0.0.1:8081/snapshots</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
@ -510,7 +517,7 @@
|
||||
<version>1.12</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-artifacts</id>
|
||||
<id>attach-features</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
@ -630,7 +637,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</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</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>
|
||||
@ -686,69 +693,87 @@
|
||||
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>license-aggregate</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>aggregate.marker</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<profile>
|
||||
<id>license-aggregate</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>aggregate.marker</exists>
|
||||
</file>
|
||||
</activation>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<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
|
||||
-->
|
||||
<execution>
|
||||
<id>aggregate-add-third-party</id>
|
||||
<goals>
|
||||
<goal>aggregate-add-third-party</goal>
|
||||
</goals>
|
||||
<phase>prepare-package</phase>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/generated-sources/license</outputDirectory>
|
||||
<thirdPartyFilename>ALL-DEPENDENCIES</thirdPartyFilename>
|
||||
|
||||
<acceptPomPackaging>true</acceptPomPackaging>
|
||||
<includeTransitiveDependencies>false</includeTransitiveDependencies>
|
||||
<excludeTransitiveDependencies>true</excludeTransitiveDependencies>
|
||||
<excludedGroups>^ru\.entaxy\.esb</excludedGroups>
|
||||
<excludedScopes>test, provided</excludedScopes>
|
||||
<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>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>
|
||||
<licenseMerge>CDDL/GPLv2+CE|CDDL + GPLv2 with classpath exception</licenseMerge>
|
||||
<licenseMerge>GPLv2+CE|GPL2 w/ CPE</licenseMerge>
|
||||
<licenseMerge>CDDL/GPL|CDDL+GPL License</licenseMerge>
|
||||
<licenseMerge>LGPL|lgpl|GNU Lesser General Public License</licenseMerge>
|
||||
<licenseMerge>BSD|The BSD License</licenseMerge>
|
||||
<licenseMerge>MIT|MIT License</licenseMerge>
|
||||
</licenseMerges>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<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>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>target/generated-sources/license/ALL-DEPENDENCIES</file>
|
||||
<type>deps</type>
|
||||
<classifier>aggregated</classifier>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</profile>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>license-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- collect all the dependencies through all the underlying modules
|
||||
-->
|
||||
<execution>
|
||||
<id>aggregate-add-third-party</id>
|
||||
<goals>
|
||||
<goal>aggregate-add-third-party</goal>
|
||||
</goals>
|
||||
<phase>prepare-package</phase>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/generated-sources/license</outputDirectory>
|
||||
<thirdPartyFilename>ALL-DEPENDENCIES</thirdPartyFilename>
|
||||
|
||||
<acceptPomPackaging>false</acceptPomPackaging>
|
||||
<includeTransitiveDependencies>false</includeTransitiveDependencies>
|
||||
<excludeTransitiveDependencies>true</excludeTransitiveDependencies>
|
||||
<excludedGroups>^ru\.entaxy\.esb</excludedGroups>
|
||||
<excludedScopes>test, provided</excludedScopes>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-artifacts</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>target/generated-sources/license/ALL-DEPENDENCIES</file>
|
||||
<type>deps</type>
|
||||
<classifier>aggregated</classifier>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</profile>
|
||||
</profiles>
|
||||
<!-- TODO Imrove it!!! -->
|
||||
<organization>
|
||||
|
||||
Reference in New Issue
Block a user