Commit 997aab1a authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	Jenkinsfile
	bonita-userfilter-custom-user-info/pom.xml
parents f21b0ba6 0bc4b70f
......@@ -14,12 +14,12 @@ timestamps {
stage('🔧 Build') {
try {
def goals = 'install'
def goals = 'clean install'
if (isBaseBranch()) {
goals = 'clean deploy -DaltDeploymentRepository=${env.ALT_DEPLOYMENT_REPOSITORY_SNAPSHOTS}'
}
// the -B flag disables download progress logs
sh "./mvnw -B install"
if (isBaseBranch()) {
sh "./mvnw -B -f bonita-userfilter-package/pom.xml -B deploy -DaltDeploymentRepository=${env.ALT_DEPLOYMENT_REPOSITORY_SNAPSHOTS}"
}
sh "./mvnw -B $goal"
} finally {
junit '**/target/surefire-reports/*.xml,**/target/failsafe-reports/*.xml'
archiveArtifacts '**/target/*.zip'
......
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.userfilter</groupId>
<artifactId>bonita-userfilter</artifactId>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.userfilter</groupId>
<artifactId>bonita-userfilter</artifactId>
<version>7.8.0-SNAPSHOT</version>
</parent>
<artifactId>bonita-userfilter-custom-user-info</artifactId>
<packaging>pom</packaging>
<modules>
<module>bonita-userfilter-custom-user-info-def</module>
<module>bonita-userfilter-custom-user-info-impl</module>
</modules>
</parent>
<artifactId>bonita-userfilter-custom-user-info</artifactId>
<packaging>pom</packaging>
<modules>
<module>bonita-userfilter-custom-user-info-def</module>
<module>bonita-userfilter-custom-user-info-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
......@@ -15,4 +15,16 @@
<module>bonita-userfilter-initiator-manager-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -14,5 +14,17 @@
<module>bonita-userfilter-initiator-def</module>
<module>bonita-userfilter-initiator-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bonita-userfilter</artifactId>
......@@ -7,13 +8,24 @@
<version>7.8.0-SNAPSHOT</version>
</parent>
<artifactId>bonita-userfilter-same-task-user</artifactId>
<packaging>pom</packaging>
<artifactId>bonita-userfilter-same-task-user</artifactId>
<packaging>pom</packaging>
<modules>
<module>bonita-userfilter-same-task-user-def</module>
<module>bonita-userfilter-same-task-user-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bonita-userfilter</artifactId>
......@@ -7,13 +8,24 @@
<version>7.8.0-SNAPSHOT</version>
</parent>
<artifactId>bonita-userfilter-single-user</artifactId>
<packaging>pom</packaging>
<artifactId>bonita-userfilter-single-user</artifactId>
<packaging>pom</packaging>
<modules>
<module>bonita-userfilter-single-user-def</module>
<module>bonita-userfilter-single-user-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -15,5 +15,17 @@
<module>bonita-userfilter-user-manager-def</module>
<module>bonita-userfilter-user-manager-impl</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment