Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Aug 12, 2015
2 parents cdb9831 + 4c81ec3 commit 56faf49
Show file tree
Hide file tree
Showing 149 changed files with 3,102 additions and 2,558 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -4,6 +4,7 @@
.settings
.idea
*.iml
*.versionsBackup
target
rebel.xml
samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/bin
Expand Down
5 changes: 3 additions & 2 deletions build-system/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -406,7 +406,7 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<version>1.4.1.23</version>
<version>1.4.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.polygon</groupId>
Expand Down Expand Up @@ -828,6 +828,7 @@
</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>
Expand Down
4 changes: 2 additions & 2 deletions cli/common/pom.xml
View file
Expand Up @@ -23,12 +23,12 @@
<name>midPoint CLI Interface - common</name>
<groupId>com.evolveum.midpoint.cli</groupId>
<artifactId>common</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>

<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>cli</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cli/ninja/pom.xml
View file
Expand Up @@ -23,12 +23,12 @@
<name>midPoint CLI Interface - ninja</name>
<groupId>com.evolveum.midpoint.cli</groupId>
<artifactId>ninja</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>

<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>cli</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cli/pom.xml
View file
Expand Up @@ -22,13 +22,13 @@

<name>midPoint CLI Interface</name>
<artifactId>cli</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions cli/seppuku/pom.xml
View file
Expand Up @@ -23,12 +23,12 @@
<name>midPoint CLI Interface - seppuku</name>
<groupId>com.evolveum.midpoint.cli</groupId>
<artifactId>seppuku</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>

<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>cli</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion custom/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand Down
10 changes: 5 additions & 5 deletions dist/midpoint-api/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<relativePath>../../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,22 +51,22 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>schema</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>util</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
8 changes: 4 additions & 4 deletions dist/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,20 +51,20 @@
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<type>zip</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui-en-US/pom.xml
View file
Expand Up @@ -21,11 +21,11 @@
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-en-US</artifactId>
<packaging>jar</packaging>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui-es-ES/pom.xml
View file
Expand Up @@ -21,11 +21,11 @@
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-es-ES</artifactId>
<packaging>jar</packaging>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui-sk-SK/pom.xml
View file
Expand Up @@ -21,11 +21,11 @@
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-sk-SK</artifactId>
<packaging>jar</packaging>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui-tr-TR/pom.xml
View file
Expand Up @@ -21,11 +21,11 @@
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-tr-TR</artifactId>
<packaging>jar</packaging>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</parent>
<build>
<resources>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 56faf49

Please sign in to comment.