Skip to content

Commit

Permalink
Merge branch 'support-3.7' of https://github.com/Evolveum/midpoint in…
Browse files Browse the repository at this point in the history
…to support-3.7
  • Loading branch information
katkav committed Mar 29, 2018
2 parents 935b25c + 3230138 commit d9f1a68
Show file tree
Hide file tree
Showing 148 changed files with 2,624 additions and 1,095 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ before_install:
- 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='-Xmx4g'
- 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
Expand All @@ -26,6 +26,10 @@ addons:
#packages:
#- oracle-java8-installer # install newest JDK8

env:
global:
- MALLOC_ARENA_MAX=2

jdk:
#- openjdk7
#- oraclejdk7
Expand Down
25 changes: 12 additions & 13 deletions NEWS
@@ -1,20 +1,19 @@
midPoint 3.7 "Darwin"
midPoint 3.7.1 "Darwin" Update 1
----------------------------------

Release 3.7 is a twenty third midPoint release code-named Darwin.
The 3.7 release brings new deployment model and numerous gradual improvements.
There are improvements of identity governance features, improvements of user
interface and internal improvements.
Release 3.7.1 is a twenty fourth midPoint release. It is the fist maintenance
update for 3.7.x version family code-named Darwin. The 3.7.1 release brings
stability improvements and several minor features.

Release date: 18th December 2017
Release date: 8th March 2018

Changes with respect to version 3.6.1:
Stand-alone deployment based on Spring Boot
User interface improvements
Governance improvements
Expression, mapping and bulk action improvements
Security improvements
Task improvements
Changes with respect to version 3.7:
Provisioning Propagation
Password Policy: prohibited projection values
Negative item enumeration in authorizations (exceptItem)
Ad-hoc provisioning script execution
Improved handling of function libraries
Improved SMS gateway support (HTTP POST method)
Miscellaneous improvements

Java 7 environment is no longer supported.
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES
@@ -1,4 +1,4 @@
To see actual releases notes please go to:

https://wiki.evolveum.com/display/midPoint/Release+3.7
https://wiki.evolveum.com/display/midPoint/Release+3.7.1

2 changes: 1 addition & 1 deletion build-system/pom.xml
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
</parent>
<pluginRepositories>
<pluginRepository>
Expand Down
2 changes: 1 addition & 1 deletion custom/pom.xml
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand Down
12 changes: 6 additions & 6 deletions dist/midpoint-api/pom.xml
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<relativePath>../../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,31 +51,31 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>schema</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>prism</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>util</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions dist/pom.xml
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,13 +51,13 @@
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>ninja</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
</dependency>
<dependency><!-- Not used, but required for surefire plugin not to complain -->
<groupId>org.testng</groupId>
Expand All @@ -71,7 +71,7 @@
<!-- Used to pull XSD files from the JAR -->
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>schema-dist-maven-plugin</artifactId>
<version>3.7.1-SNAPSHOT</version>
<version>3.7.2-SNAPSHOT</version>
<executions>
<execution>
<id>schemadist-prism</id>
Expand Down

0 comments on commit d9f1a68

Please sign in to comment.