Skip to content

Commit

Permalink
Start of 3.2 development
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Feb 2, 2015
1 parent b2f654d commit 18d2f75
Show file tree
Hide file tree
Showing 69 changed files with 461 additions and 461 deletions.
2 changes: 1 addition & 1 deletion build-system/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</parent>
<pluginRepositories>
<pluginRepository>
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.1</version>
<version>3.2-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.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>schema</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>util</artifactId>
<version>3.1</version>
<version>3.2-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.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<type>zip</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>3.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-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.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-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.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-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.1</version>
<version>3.2-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.1</version>
<version>3.2-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</parent>
<build>
<resources>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
56 changes: 28 additions & 28 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -20,11 +20,11 @@
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<packaging>war</packaging>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
Expand Down Expand Up @@ -188,22 +188,22 @@
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-en-US</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-sk-SK</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-tr-TR</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui-es-ES</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>

<!-- JDBC DRIVERS -->
Expand All @@ -216,7 +216,7 @@
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>repo-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>jaxb-impl</artifactId>
Expand All @@ -231,39 +231,39 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>report-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>security-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>workflow-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>notifications-api</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<!-- MIDPOINT RUNTIME DEPENDENCIES -->
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>repo-sql-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>repo-cache</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Expand All @@ -283,25 +283,25 @@
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>task-quartz-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>audit-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>security-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Expand All @@ -313,37 +313,37 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>workflow-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>notifications-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.provisioning</groupId>
<artifactId>provisioning-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>system-init</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>report-impl</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
Expand Down Expand Up @@ -447,13 +447,13 @@
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>repo-test-util</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>repo-sql-impl-test</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -470,7 +470,7 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -554,7 +554,7 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-test</artifactId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion gui/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1</version>
<version>3.2-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand Down

0 comments on commit 18d2f75

Please sign in to comment.