Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
katkav committed Sep 28, 2021
2 parents 8550860 + 33ebfb5 commit 9a603b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 3 additions & 5 deletions dist/javadoc/pom.xml
Expand Up @@ -22,12 +22,10 @@
<name>midPoint JavaDoc</name>

<properties>
<!-- see notes in main midPoint POM -->
<!-- MID-5666: For some reason deploying of javadoc was disabled -->
<!--
<!-- Don't set maven.deploy.skip to true, we want Jenkins to publish artifacts, see MID-5666. -->
<!-- See notes in main midPoint POM, install skip allows for -Dmaven.javadoc.skip, see MID-7242. -->
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
-->
<!-- This enables build without -DskipTests option (e.g. full build). -->
<maven.test.skip>true</maven.test.skip>
</properties>

Expand Down
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -25,6 +25,7 @@
VARIOUS MVN COMMANDS (with rough times on average notebook)
Note: Javadoc takes long time but it's only part of the "dist" profile (active by default).
Hence, "-Dmaven.javadoc.skip" is not necessary with "-P -dist".
Javadoc skip can still be useful when we want to build distribution package faster.
Quick developer's run without any tests, skipping distribution (~6m):
mvn clean install -P -dist -DskipTests
Expand Down
2 changes: 1 addition & 1 deletion repo/repo-sqale/testng-unit.xml
Expand Up @@ -5,7 +5,7 @@
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->
<suite name="Suite" parallel="none">
<suite name="unit repo-sqale" parallel="none">
<test name="Fast functional tests" parallel="none">
<classes>
<class name="com.evolveum.midpoint.repo.sqale.func.AuditCleanupTest"/>
Expand Down

0 comments on commit 9a603b1

Please sign in to comment.