Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history 
Conflicts:
	build-system/pom.xml
	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
  • Loading branch information
@katkav
katkav committed Feb 26, 2015
2 parents b7f40f2 + 47675e3 commit 93d5f4f
Show file tree
Hide file tree
Showing 623 changed files with 23,809 additions and 13,076 deletions.
55 changes: 26 additions & 29 deletions NEWS
View file
@@ -1,31 +1,28 @@
midPoint 3.0 "Newton"
midPoint 3.1 "Sinan"
---------------------

* Generic synchronization: synchronize almost any type of object to the resource
* Entitlement management support allows management of resource groups, privileges and roles in a native and convenient way.
* Delegated Administration: ability to define fine-grained authorizations scoped to a specific organizational unit. Attribute-level authorizations.
* REST API
* Improved reporting (based on Jasper Reports)
* Performance improvements
* Bulk actions: Ability to execute an action on all users/accounts (or subset).
* GUI improvements: Improved GUI design and ergonomics, ability to conveniently adjust some aspects of GUI look&feel
* Switch to common OpenICF/ConnId 1.4 framework
* Schema and interface cleanup
* Scripting Hooks
* Schema documentation automatically generated from the definition (schemadoc)
* Higher-order inducements
* New expression evaluators for assignments and entitlement associations
* Iteration support for focal objects (e.g. users)
* New administration GUI pages
* Partial multi-tenancy support
* Support for resource read-only mode
* Extended function libraries for expressions
* Support for time-based mappings in object template
* Improved synchronization reaction configuration options
* Improved reconciliation and synchronization performance
* Support for filters in protected accounts specification
* Support for binary attribute values
* Support for user photo
* Schema improvements
* Improved logging messages

* Resource wizard
* Improved role and organization user interface
* Improved entitlement GUI
* Notification support for roles and organizations
* GUI progress indicator for provisioning operations
* Support for account lock-out attributes. Also for lock-out attributes
simulation.
* Conditional roles and assignments/inducements.
* Changes in assignment parameters are provisioned immediately,
reconciliation is no longer needed.
* OID-bound mode for attributes.
* Multi-tenancy improvements in GUI.
* Generic synchronization improvements in GUI.
* Improved provisioning dependencies.
* Support for iteration in inbound expressions (object template).
* Significant performance improvements
** Improved performance of organization structure ("org closure table").
** Improved import and reconciliation performance (parallelization).
* Polygon versions of LDAP, DBTable and CSVFile connectors
* Significantly improved paging support in LDAP connector
* Support for case-insensitive attribute names.
* Improved authorization and delegated administration support in GUI.
* Support for "priority attributes" to work around some connector problems.
* Improved reporting engine based on Jasper Reports.
* Numerous user experience improvements.
5 changes: 2 additions & 3 deletions README
View file
@@ -1,4 +1,4 @@
midPoint 3.0 "Newton"
midPoint 3.1 "Sinan"
---------------------

General informations:
Expand All @@ -9,7 +9,7 @@ MidPoint also makes the data available in unified form.

The most important features of midPoint are:
- User provisioning and deprovisioning
- Integration of Identity Connector Framework
- Integration of ConnId connector framework
- Administration GUI
- Identity repository implemention (SQL)
- Custom schema extensibility
Expand All @@ -29,7 +29,6 @@ The most important features of midPoint are:
- Notifications
- Local Java APIs, Remote web service interface (SOAP), REST API
- High availablity (HA) support


For more information please go to:

Expand Down
90 changes: 78 additions & 12 deletions build-system/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint</artifactId>
<version>3.1-SNAPSHOT</version>
<version>3.2-SNAPSHOT</version>
</parent>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -56,23 +56,24 @@
<mockito.version>1.10.8</mockito.version>
<quartz.version>2.1.3</quartz.version>
<selenium.version>1.0.1</selenium.version>
<slf4j.version>1.6.4</slf4j.version>
<slf4j.version>1.7.10</slf4j.version>
<spring.version>4.0.6.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
<testng.version>6.8.8</testng.version>
<xml.resolver.version>1.2</xml.resolver.version>
<cron4j.version>2.2.3</cron4j.version>
<hibernate.version>4.1.12.Final</hibernate.version>
<hibernate.version>4.3.8.Final</hibernate.version>
<h2.version>1.3.171</h2.version>
<jdbc.postgres>9.3-1102-jdbc41</jdbc.postgres>
<jdbc.mysql>5.1.31</jdbc.mysql>
<wicket.version>6.17.0</wicket.version>
<groovy.version>1.8.6</groovy.version>
<activiti-engine.version>5.15.1</activiti-engine.version>
<activiti-spring.version>5.15.1</activiti-spring.version>
<activiti-engine.version>5.17.0</activiti-engine.version>
<activiti-spring.version>5.17.0</activiti-spring.version>
<commons-email.version>1.3</commons-email.version>
<xmlsec.version>2.0.1</xmlsec.version>
<connid.version>1.4.0.1-SNAPSHOT</connid.version>
<connid.version>1.4.0.49</connid.version>
<jasper.version>6.0.0</jasper.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -172,7 +173,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
Expand Down Expand Up @@ -383,17 +384,17 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-databasetable</artifactId>
<version>1.4.0.1-SNAPSHOT</version>
<version>1.4.0.49</version>
</dependency>
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-csvfile</artifactId>
<version>1.4.0.1-SNAPSHOT</version>
<version>1.4.0.49</version>
</dependency>
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<version>1.4.0.1-SNAPSHOT</version>
<version>1.4.0.49</version>
</dependency>
<!-- End connectors -->
<dependency>
Expand Down Expand Up @@ -431,6 +432,12 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
Expand Down Expand Up @@ -551,14 +558,39 @@
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>

<!-- report dependency (needed for microsoft office formats) -->
<!-- Jasper reports -->
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>${jasper.version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- report dependency (needed for microsoft office formats) -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.10.1</version>
</dependency>


</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -781,6 +813,40 @@
<onlyAnalyze>com.evolveum.midpoint.*</onlyAnalyze>
</configuration>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules>
<DependencyConvergence />
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>analyze</id>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</execution>
</executions>
</plugin> -->
</plugins>
</build>
<reporting>
Expand Down

0 comments on commit 93d5f4f

Please sign in to comment.