Skip to content

Commit

Permalink
Merge branch 'evolveum-local/master' into feature/shadow-naming-attir…
Browse files Browse the repository at this point in the history 
…butes
  • Loading branch information
@bpowers1215
bpowers1215 committed Jul 23, 2019
2 parents 6f6c195 + 28c9877 commit 2157e29
Show file tree
Hide file tree
Showing 2,414 changed files with 81,406 additions and 205,399 deletions.
19 changes: 12 additions & 7 deletions .travis.yml
View file
@@ -1,5 +1,6 @@
os: windows
language: shell
sudo: required
dist: trusty
language: java

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

before_install:
- choco install maven
- RefreshEnv.cmd
- export MAVEN_OPTS='-Xmx6g'
- export JAVA_HOME=`find "/c/Program Files/Java" -name jdk1.8.*`
- wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip
- unzip -qq apache-maven-3.6.1-bin.zip
- export M2_HOME=$PWD/apache-maven-3.6.1
- 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

addons:
hostname: localhost # workaround for short hostname

env:
global:
- MALLOC_ARENA_MAX=2

matrix:
include:
- name: JDK8 - Run all excluding model-intest
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Expand Up @@ -27,7 +27,7 @@ The most important features of midPoint are:
- Provisioning consistency and error handling
- Support for security auditing and reporting
- Data protection (experimental)
- Workflow
- Request approval
- Reporting
- Notifications
- Local Java APIs, Remote web service interface (SOAP), REST API
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -14,7 +14,7 @@ The most important features of midPoint are:
- Security auditing and reporting
- Organizational structure management
- Credential Management
- Workflow
- Request approval
- Entitlement Management

Read more about these features at https://evolveum.com/midpoint/about-midpoint/
Expand Down
108 changes: 54 additions & 54 deletions build-system/pom.xml
View file
Expand Up @@ -49,13 +49,14 @@
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.7</commons.lang3.version>
<commons.cli>1.2</commons.cli>
<cxf.version>3.2.4</cxf.version>
<cxf-xjc.version>3.2.0</cxf-xjc.version>
<cxf.version>3.3.1</cxf.version>
<cxf-xjc.version>3.3.0</cxf-xjc.version>
<wss4j.version>2.2.0</wss4j.version>
<dbunit.version>2.4.7</dbunit.version>
<jaxb-api.version>2.2.10</jaxb-api.version>
<jaxb.version>2.2.10</jaxb.version>
<jaxb.version>2.2.10</jaxb.version> <!-- 2.2.10 -->
<jaxb-xjc.version>2.2.10</jaxb-xjc.version>
<jaxb-runtime.version>2.3.2</jaxb-runtime.version>
<junit.version>4.8.2</junit.version>
<opendj.version>2.6.2</opendj.version>
<mockito.version>1.10.8</mockito.version>
Expand All @@ -78,17 +79,15 @@
<jdbc.sqlserver>6.4.0.jre8</jdbc.sqlserver>
<jdbc.mariadb>2.3.0</jdbc.mariadb>
<jdbc.mysql>6.0.6</jdbc.mysql>
<wicket.version>8.0.0</wicket.version>
<wicket.version>8.3.0</wicket.version>
<groovy.version>2.5.6</groovy.version>
<activiti-engine.version>5.22.0</activiti-engine.version>
<activiti-spring.version>5.22.0</activiti-spring.version>
<commons-email.version>1.3</commons-email.version>
<xmlsec.version>2.0.6</xmlsec.version>
<connid.version>1.5.0.10</connid.version>
<jasper.version>6.5.0</jasper.version>
<derby.version>10.11.1.1</derby.version>
<wro4j.version>1.8.0</wro4j.version>
<jackson.version>2.9.8</jackson.version>
<jackson.version>2.9.9</jackson.version>
<snakeyaml.version>1.19</snakeyaml.version>
<surefire.version>3.0.0-M2</surefire.version>
<reflections.version>0.9.11</reflections.version>
Expand All @@ -97,6 +96,8 @@
<failsafe.version>3.0.0-M2</failsafe.version>
<antrun.version>1.8</antrun.version>
<qpid-broker.version>7.1.1</qpid-broker.version>
<jakarta.jaxb.version>2.3.2</jakarta.jaxb.version>
<asm.version>7.0</asm.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -172,12 +173,17 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
<version>8.0.0-M7</version>
<exclusions>
<exclusion> <!-- Conflicting version with activiti -->
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
<!--<exclusions>-->
<!--<exclusion> &lt;!&ndash; Conflicting version with activiti &ndash;&gt;-->
<!--<groupId>joda-time</groupId>-->
<!--<artifactId>joda-time</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -195,32 +201,6 @@
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
<version>${activiti-engine.version}</version>
<exclusions>
<exclusion> <!-- Conflicting version with direct dependency -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring</artifactId>
<version>${activiti-spring.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
Expand Down Expand Up @@ -335,8 +315,6 @@
<dependency>
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
<!-- <version>20100725</version> -->
<!--<version>20110809</version>-->
<version>20140925</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -498,6 +476,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
<exclusions>
<!-- Conflicting version with sun jaxb-xjc -->
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down Expand Up @@ -584,16 +569,22 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<exclusion> <!-- Version in dependency of org.opensaml:opensaml conflicts with activiti-engine -->
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
<!--<exclusion> &lt;!&ndash; Version in dependency of org.opensaml:opensaml conflicts with activiti-engine &ndash;&gt;-->
<!--<groupId>joda-time</groupId>-->
<!--<artifactId>joda-time</artifactId>-->
<!--</exclusion>-->
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down Expand Up @@ -685,7 +676,7 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<version>2.2</version>
<version>2.3-M1</version>
</dependency>
<!-- End connectors -->
<dependency>
Expand Down Expand Up @@ -1048,7 +1039,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.6.0</version>
<!--
<version>3.1.0</version>
<exclusions>
Expand Down Expand Up @@ -1340,11 +1331,11 @@
<source>${project.source.version}</source>
<target>${project.source.version}</target>
<fork>true</fork>
<meminitial>128m</meminitial>
<maxmem>768m</maxmem>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<verbose>true</verbose>
<meminitial>1024m</meminitial>
<maxmem>2048m</maxmem>
<showDeprecation>false</showDeprecation>
<showWarnings>true</showWarnings>
<!-- <verbose>true</verbose> -->
<!--<showWarnings>false</showWarnings -->
</configuration>
</plugin>
Expand Down Expand Up @@ -1491,7 +1482,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce</id>
Expand All @@ -1509,7 +1500,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.1e1</version>
<executions>
<execution>
<id>analyze</id>
Expand Down Expand Up @@ -1550,6 +1541,15 @@
<ignoredUsedUndeclaredDependency>xml-apis:xml-apis</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>stax:stax-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.springframework.ldap:spring-ldap-core</ignoredUsedUndeclaredDependency>

<!-- needs to much exclusions, used by apache-cxf (xjc plugin, prism-impl, schema, ..) -->
<ignoredUsedUndeclaredDependency>jakarta.activation:jakarta.activation-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.glassfish.jaxb:xsom</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.glassfish.jaxb:jaxb-runtime</ignoredUsedUndeclaredDependency>

<ignoredUsedUndeclaredDependency>org.danekja:jdk-serializable-functional</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.springframework.boot:spring-boot-test</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
</configuration>
</execution>
Expand Down
4 changes: 0 additions & 4 deletions config/initial-objects/000-system-configuration.xml
View file
Expand Up @@ -157,9 +157,5 @@
<color>purple</color>
<authorization>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#resources</authorization>
</userDashboardLink>
<enableExperimentalFeatures>true</enableExperimentalFeatures>
</adminGuiConfiguration>
<internals>
<enableExperimentalCode>true</enableExperimentalCode>
</internals>
</systemConfiguration>
8 changes: 4 additions & 4 deletions config/initial-objects/040-role-enduser.xml
View file
Expand Up @@ -175,18 +175,18 @@
</object>
</authorization>
<authorization>
<name>assignment-target-read-task</name>
<name>assignment-target-read-case</name>
<description>
Authorization that allows to read workflow status of tasks. This is used to display requests
Authorization that allows to read approval status of cases. This is used to display requests
to the end users, especially in the "My Requests" box in user dashboard.
This authorization is a temporary solution. It will be replaced by a finer-grained
permissions in the future.
</description>
<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
<object>
<type>TaskType</type>
<type>CaseType</type>
</object>
<item>workflowContext</item>
<item>approvalContext</item>
</authorization>
<authorization>
<name>self-owned-task-read</name>
Expand Down
10 changes: 5 additions & 5 deletions config/initial-objects/041-role-approver.xml
View file
Expand Up @@ -52,18 +52,18 @@
</object>
</authorization> -->
<authorization>
<name>tasks-read</name>
<name>cases-read</name>
<description>
Allow to see the requester of the operation that is being approved and the current delta.
In order for the approver to see other properties (e.g. history of the approvals) please allow read access
to other items as well, e.g. to the whole workflowContext.
to other items as well.
</description>
<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
<object>
<type>TaskType</type>
<type>CaseType</type>
</object>
<item>workflowContext/requesterRef</item>
<item>workflowContext/processorSpecificState</item>
<item>requesterRef</item>
<item>approvalContext</item>
</authorization>
<authorization>
<name>users-read</name>
Expand Down

0 comments on commit 2157e29

Please sign in to comment.