Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
* 'master' of github.com:Evolveum/midpoint:
  POMs: Spring Boot bump to 2.7.3, upgrade of artemis-server
  • Loading branch information
katkav committed Sep 6, 2022
2 parents 6a05852 + 5460973 commit 5b95bca
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
mvn clean install -P -docs -DskipTests
Generated distribution archives (ZIP and tar.gz) are under dist/target.
Quick build of everything without tests, not often useful, javadoc + apidocs add quite a lot time (~9m):
Quick build of everything without tests, not often useful, javadoc + apidocs add quite a lot of time (~9m):
mvn clean install -DskipTests
"Quick" build with unit tests only and checkstyle (~30m):
Expand Down Expand Up @@ -94,9 +94,9 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<!-- This parent also declares dependencies listed here:
https://docs.spring.io/spring-boot/docs/2.7.1/reference/html/dependency-versions.html#dependency-versions
https://docs.spring.io/spring-boot/docs/2.7.3/reference/html/dependency-versions.html#dependency-versions
Or for current version of Spring Boot:
https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-dependency-versions.html
-->
Expand Down Expand Up @@ -212,7 +212,7 @@
<xmlunit.version>2.8.2</xmlunit.version>
<hibernate.version>5.5.3.Final</hibernate.version>
<!--
Default Spring Boot 2.7.1 uses H2 2.1.x, which is a big step from our current.
Default Spring Boot 2.7.3 uses H2 2.1.x, which is a big step from our current.
Every upgrade after v193 up to 1.4.200 had issues for use, some are probably fixed like this NPE bug
https://github.com/h2database/h2database/issues/1808, but we don't know how many changes to expect.
Sometimes occurs on heavy concurrent test, e.g. on TestDummyParallelism, but also during app run.
Expand All @@ -227,8 +227,8 @@
<wicket.version>9.11.0</wicket.version>
<wicketstuff.version>9.11.0</wicketstuff.version>
<wicket.chartjs.version>0.1</wicket.chartjs.version>
<!-- Groovy 3.0.11 is also default for Spring Boot 2.7.1 -->
<groovy.version>3.0.11</groovy.version>
<!-- Groovy 3.0.12 is also default for Spring Boot 2.7.3 -->
<groovy.version>3.0.12</groovy.version>
<xmlsec.version>2.2.4</xmlsec.version>
<!-- NOTE: also update the version number in TestConnectorManager -->
<connid.version>1.5.1.3</connid.version>
Expand All @@ -240,7 +240,7 @@
<guava.version>31.1-jre</guava.version>
<jcommander.version>1.82</jcommander.version>
<qpid-broker.version>8.0.4</qpid-broker.version>
<apache-artemis.version>2.23.1</apache-artemis.version>
<artemis.version>2.24.0</artemis.version> <!-- name matches property from Boot parent -->
<asm.version>9.3</asm.version>
<geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
<jetty.version>11.0.11</jetty.version>
Expand Down Expand Up @@ -1490,7 +1490,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>${apache-artemis.version}</version>
<version>${artemis.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
Expand All @@ -1501,17 +1501,17 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-client</artifactId>
<version>${apache-artemis.version}</version>
<version>${artemis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
<version>${apache-artemis.version}</version>
<version>${artemis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId>
<version>${apache-artemis.version}</version>
<version>${artemis.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1829,7 +1829,7 @@
<ignoredUsedUndeclaredDependency>jakarta.activation:jakarta.activation-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>com.sun.activation:jakarta.activation</ignoredUsedUndeclaredDependency>

<!-- needs to much exclusions, used by apache-cxf (xjc plugin, prism-impl, schema, ..) -->
<!-- needs too many exclusions, used by apache-cxf (xjc plugin, prism-impl, schema, ..) -->
<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.glassfish.jaxb:xsom</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.glassfish.jaxb:jaxb-runtime</ignoredUsedUndeclaredDependency>
Expand Down Expand Up @@ -2140,7 +2140,7 @@
Technically, even both can be used, but go with the one used in that POM.
- Test testing plugin says skipTests=false (that is to run the tests).
- It defines system property mp.perf.report.prefix=target/PERF (without it CSV goes to stdout).
- It defines suiteXmlFile=testng-perf.xml - suite file is different then normally used ones.
- It defines suiteXmlFile=testng-perf.xml - suite file is different from normally used ones.
Typically, perf test classes are ONLY in perf suite as they would slow down default builds.
-->
<profile>
Expand Down

0 comments on commit 5b95bca

Please sign in to comment.