Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/thresholds
Browse files Browse the repository at this point in the history 
# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
  • Loading branch information
@katkav
katkav committed Dec 26, 2018
2 parents cce8e60 + 590c3bc commit 4b78e74
Show file tree
Hide file tree
Showing 422 changed files with 9,016 additions and 18,936 deletions.
34 changes: 13 additions & 21 deletions .travis.yml
View file
@@ -1,6 +1,5 @@
sudo: required
dist: trusty
language: java
os: windows
language: shell

#skips default install - see script bellow
install: true
Expand All @@ -10,28 +9,21 @@ cache:
- $HOME/.m2

before_install:
#- wget http://ftp.wayne.edu/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
- wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip
- unzip -qq apache-maven-3.5.0-bin.zip
- export M2_HOME=$PWD/apache-maven-3.5.0
- export PATH=$M2_HOME/bin:$PATH
- export MAVEN_OPTS='-Xmx6g'

# custom script is used so build and tests are done in one mvn command, separating it (as Travis does by default) leads to problem with ConnId (notably DummyResource)
script: mvn clean install
- choco install maven
- RefreshEnv.cmd
- export MAVEN_OPTS='-Xmx6g'
- export JAVA_HOME=`find "/c/Program Files/Java" -name jdk1.8.*`

addons:
hostname: localhost # workaround for short hostname
#apt:
#packages:
#- oracle-java8-installer # install newest JDK8

env:
global:
- MALLOC_ARENA_MAX=2

jdk:
#- openjdk7
#- oraclejdk7
- oraclejdk8
- openjdk8

matrix:
include:
- name: JDK8 - Run all excluding model-intest
script: mvn install -T 1C -q -DskipTests; mvn verify -DskipModelIntTest=true -DskipModelUnitTest=true -DtestsRetryCount=2
- name: JDK8 - Run only model-intest
script: mvn install -T 1C -q -DskipTests; travis_wait 120 mvn verify -pl :model-intest -DtestsRetryCount=2
30 changes: 15 additions & 15 deletions .tx/config
View file
@@ -1,15 +1,15 @@
[main]
host = https://www.transifex.com

[midpoint.admin-gui]
file_filter = gui/admin-gui/src/main/resources/localization/Midpoint_<lang>.properties
source_file = gui/admin-gui/src/main/resources/localization/Midpoint.properties
source_lang = en
type = UNICODEPROPERTIES

[midpoint.schema]
file_filter = infra/schema/src/main/resources/localization/schema_<lang>.properties
source_file = infra/schema/src/main/resources/localization/schema.properties
source_lang = en
type = UNICODEPROPERTIES

[main]
host = https://www.transifex.com
[midpoint.admin-gui]
file_filter = gui/admin-gui/src/main/resources/localization/Midpoint_<lang>.properties
source_file = gui/admin-gui/src/main/resources/localization/Midpoint.properties
source_lang = en
type = UNICODEPROPERTIES
[midpoint.schema]
file_filter = infra/schema/src/main/resources/localization/schema_<lang>.properties
source_file = infra/schema/src/main/resources/localization/schema.properties
source_lang = en
type = UNICODEPROPERTIES
237 changes: 146 additions & 91 deletions build-system/pom.xml
View file
Expand Up @@ -67,7 +67,7 @@
<spring.version>5.0.7.RELEASE</spring.version>
<spring.security.version>5.0.6.RELEASE</spring.security.version>
<cas.client.version>3.5.0</cas.client.version>
<testng.version>6.8.8</testng.version>
<testng.version>6.14.3</testng.version>
<xml.resolver.version>1.2</xml.resolver.version>
<xmlunit.version>2.1.1</xmlunit.version>
<cron4j.version>2.2.3</cron4j.version>
Expand All @@ -89,11 +89,11 @@
<wro4j.version>1.8.0</wro4j.version>
<jackson.version>2.9.5</jackson.version>
<snakeyaml.version>1.19</snakeyaml.version>
<surefire.version>2.22.1</surefire.version>
<surefire.version>3.0.0-M2</surefire.version>
<reflections.version>0.9.11</reflections.version>
<guava.version>20.0</guava.version>
<jcommander.version>1.72</jcommander.version>
<failsafe.version>2.22.0</failsafe.version>
<failsafe.version>3.0.0-M2</failsafe.version>
<antrun.version>1.8</antrun.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -682,7 +682,7 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-csv</artifactId>
<version>2.2</version>
<version>2.3</version>
</dependency>
<dependency>
<groupId>com.evolveum.polygon</groupId>
Expand Down Expand Up @@ -1404,94 +1404,8 @@
<jvmArgs>-Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n</jvmArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<executions>
<execution>
<id>default-test</id> <!-- unit tests -->
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Unit</value>
</property>
</properties>
</configuration>
</execution>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-integration.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Integration</value>
</property>
<property>
<name>usedefaultlisteners</name>
<value>false</value> <!-- do not generate HTML to make the runs faster -->
</property>
</properties>
</configuration>
</execution>
</executions>
<configuration>
<parallel>false</parallel>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- <runOrder>alphabetical</runOrder> -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- <threadCount>1</threadCount> -->
<!-- <perCoreThreadCount>false</perCoreThreadCount> -->
<!-- <reportFormat>plain</reportFormat> -->
<trimStackTrace>false</trimStackTrace>
<useSystemClassLoader>false</useSystemClassLoader> <!-- See https://issues.apache.org/jira/browse/SUREFIRE-1588 -->
<properties>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener</value>
</property>
</properties>
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m</argLine>
<!--<argLine>-agentpath:/usr/local/yjp-11.0.10/bin/linux-x86-64/libyjpagent.so=alloceach=10,allocsizelimit=1048576,sampling,walltimespec=/home/lazyman/.yjp/config/.walltime,noj2ee,profileruipath=/usr/local/yjp-11.0.10/bin/yjp.sh,onexit=snapshot
-Xms512m -Xmx1024m -XX:MaxPermSize=192m</argLine> -->

<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
Expand Down Expand Up @@ -1589,6 +1503,119 @@
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<executions>
<execution>
<id>default-test</id> <!-- unit tests -->
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Unit</value>
</property>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener,com.evolveum.midpoint.tools.testng.RetryListener</value>
</property>
</properties>
</configuration>
</execution>
</executions>
<configuration>
<parallel>false</parallel>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- <runOrder>alphabetical</runOrder> -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- <threadCount>1</threadCount> -->
<!-- <perCoreThreadCount>false</perCoreThreadCount> -->
<!-- <reportFormat>plain</reportFormat> -->
<trimStackTrace>false</trimStackTrace>
<useSystemClassLoader>false</useSystemClassLoader> <!-- See https://issues.apache.org/jira/browse/SUREFIRE-1588 -->
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m</argLine>
<!--<argLine>-agentpath:/usr/local/yjp-11.0.10/bin/linux-x86-64/libyjpagent.so=alloceach=10,allocsizelimit=1048576,sampling,walltimespec=/home/lazyman/.yjp/config/.walltime,noj2ee,profileruipath=/usr/local/yjp-11.0.10/bin/yjp.sh,onexit=snapshot
-Xms512m -Xmx1024m -XX:MaxPermSize=192m</argLine> -->

<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m -Duser.language=en</argLine>
<suiteXmlFiles>
<suiteXmlFile>testng-integration.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Integration</value>
</property>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener,com.evolveum.midpoint.tools.testng.RetryListener</value>
</property>
</properties>
<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
Expand Down Expand Up @@ -1626,6 +1653,13 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand All @@ -1641,6 +1675,13 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand All @@ -1656,6 +1697,13 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand All @@ -1671,6 +1719,13 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down

0 comments on commit 4b78e74

Please sign in to comment.