Skip to content

Commit

Permalink
refresh of POMs, element order, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Jan 30, 2020
1 parent 1e24722 commit aeb3481
Show file tree
Hide file tree
Showing 30 changed files with 247 additions and 479 deletions.
11 changes: 11 additions & 0 deletions build-tools/pom.xml
View file
Expand Up @@ -28,6 +28,7 @@
<name>midPoint build tools</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.test.skip>true</maven.test.skip>
</properties>

Expand Down Expand Up @@ -56,4 +57,14 @@
<url>http://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</build>
</project>
2 changes: 0 additions & 2 deletions dist/javadoc/pom.xml
View file
Expand Up @@ -34,7 +34,6 @@
<artifactId>admin-gui</artifactId>
<version>4.1-SNAPSHOT</version>
<type>war</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
Expand All @@ -50,7 +49,6 @@
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-impl</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
4 changes: 0 additions & 4 deletions dist/midpoint-api/pom.xml
View file
Expand Up @@ -26,19 +26,16 @@
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>schema</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand All @@ -49,7 +46,6 @@
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>util</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
4 changes: 0 additions & 4 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -218,7 +218,6 @@
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
Expand Down Expand Up @@ -1017,17 +1016,14 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
Expand Down
1 change: 0 additions & 1 deletion icf-connectors/pom.xml
View file
Expand Up @@ -43,7 +43,6 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency> <!-- Not used, but required for surefire plugin not to complain -->
Expand Down
3 changes: 0 additions & 3 deletions infra/common/pom.xml
View file
Expand Up @@ -128,11 +128,8 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>compile</scope>
</dependency>



<!-- Testing dependecies -->
<dependency>
<groupId>org.testng</groupId>
Expand Down
18 changes: 9 additions & 9 deletions infra/test-util/pom.xml
View file
Expand Up @@ -8,20 +8,19 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>midPoint Infrastructure - testing mock utils</name>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>test-util</artifactId>
<packaging>jar</packaging>

<parent>
<artifactId>infra</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>test-util</artifactId>
<packaging>jar</packaging>

<name>midPoint Infrastructure - testing mock utils</name>

<repositories>
<repository>
<!-- We need this for Sleepycat JE -->
Expand All @@ -30,6 +29,7 @@
<url>http://download.oracle.com/maven/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand Down
24 changes: 7 additions & 17 deletions model/certification-api/pom.xml
View file
Expand Up @@ -7,23 +7,21 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>model</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>midPoint Access Certification - api</name>

<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>certification-api</artifactId>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<name>midPoint Access Certification - api</name>

<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand Down Expand Up @@ -53,13 +51,5 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
19 changes: 8 additions & 11 deletions model/certification-impl/pom.xml
View file
Expand Up @@ -8,20 +8,19 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>midPoint Access Certification - impl</name>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>certification-impl</artifactId>
<packaging>jar</packaging>

<parent>
<artifactId>model</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>certification-impl</artifactId>
<packaging>jar</packaging>

<name>midPoint Access Certification - impl</name>

<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand Down Expand Up @@ -205,7 +204,6 @@
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -277,7 +275,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<!-- <version>4.8.2</version> -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
47 changes: 12 additions & 35 deletions model/model-api/pom.xml
View file
Expand Up @@ -8,35 +8,19 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>midPoint Model - api</name>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<packaging>jar</packaging>

<parent>
<artifactId>model</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<organization>
<name>Evolveum</name>
<url>http://www.evolveum.com</url>
</organization>
<licenses>
<license>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>Atlassian JIRA</system>
<url>http://jira.evolveum.com/</url>
</issueManagement>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<packaging>jar</packaging>

<name>midPoint Model - api</name>

<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand Down Expand Up @@ -87,12 +71,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
Expand All @@ -105,10 +83,10 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
Expand All @@ -128,7 +106,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
42 changes: 8 additions & 34 deletions model/model-common/pom.xml
View file
Expand Up @@ -8,35 +8,19 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>midPoint Model - common</name>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-common</artifactId>
<packaging>jar</packaging>

<parent>
<artifactId>model</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<organization>
<name>Evolveum</name>
<url>http://www.evolveum.com</url>
</organization>
<licenses>
<license>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>Atlassian JIRA</system>
<url>http://jira.evolveum.com/</url>
</issueManagement>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-common</artifactId>
<packaging>jar</packaging>

<name>midPoint Model - common</name>

<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
Expand Down Expand Up @@ -117,10 +101,6 @@
<artifactId>security-api</artifactId>
<version>4.1-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations-java5</artifactId>
</dependency> -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down Expand Up @@ -200,11 +180,5 @@
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

0 comments on commit aeb3481

Please sign in to comment.