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
@katkav
katkav committed Oct 24, 2017
2 parents fb6fcfc + 4f4ff1d commit 479e3cf
Show file tree
Hide file tree
Showing 267 changed files with 1,418 additions and 875 deletions.
49 changes: 37 additions & 12 deletions build-system/pom.xml
View file
Expand Up @@ -61,9 +61,11 @@
<mockito.version>1.10.8</mockito.version>
<quartz.version>2.3.0.e2</quartz.version>
<selenium.version>1.0.1</selenium.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.version>4.2.5.RELEASE</spring.version>
<spring.security.version>4.1.0.RELEASE</spring.security.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.1.11</logback.version>
<spring.boot.version>1.5.7.RELEASE</spring.boot.version>
<spring.version>4.3.11.RELEASE</spring.version>
<spring.security.version>4.2.3.RELEASE</spring.security.version>
<cas.client.version>3.4.1</cas.client.version>
<testng.version>6.8.8</testng.version>
<xml.resolver.version>1.2</xml.resolver.version>
Expand All @@ -87,9 +89,26 @@
<jackson.version>2.8.9</jackson.version>
<snakeyaml.version>1.15</snakeyaml.version>
<surefire.version>2.20</surefire.version>
<reflections.version>0.9.11</reflections.version>
<guava.version>20.0</guava.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency>

<!-- WICKET -->
<dependency>
<groupId>org.apache.wicket</groupId>
Expand Down Expand Up @@ -139,7 +158,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -245,17 +264,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.2</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.2</version>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
Expand Down Expand Up @@ -603,8 +622,17 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
Expand Down Expand Up @@ -1090,11 +1118,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
<version>0.15</version>
</dependency>
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-core</artifactId>
Expand Down Expand Up @@ -1329,6 +1352,7 @@
</manifestEntries>
</archive>
<attachClasses>true</attachClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId>
Expand Down Expand Up @@ -1506,6 +1530,7 @@
<!-- There are dependencies in this master POM. So they are projected
everywhere, used or unused. -->
<ignoredUnusedDeclaredDependency>org.springframework</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot</ignoredUnusedDeclaredDependency>

<!-- Common "drill" for all modules. -->
<ignoredUnusedDeclaredDependency>com.evolveum.midpoint.tools:test-ng</ignoredUnusedDeclaredDependency>
Expand Down
65 changes: 50 additions & 15 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -47,6 +47,7 @@
<directory>src/main/resources</directory>
<includes>
<include>localization/Midpoint*.properties</include>
<include>banner.txt</include>
</includes>
</resource>
<!-- ICF LOGGING CONFIGURATION -->
Expand Down Expand Up @@ -95,9 +96,49 @@
</includes>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
Expand Down Expand Up @@ -135,23 +176,22 @@
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
<scope>runtime</scope> <!-- used for loading js/css from webjars -->
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>less</artifactId>
<version>2.5.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator-core</artifactId>
<version>0.32</version>
</dependency>
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
<scope>runtime</scope> <!-- used to compile less files -->
<exclusions>
<exclusion>
<groupId>org.webjars</groupId>
Expand Down Expand Up @@ -220,11 +260,6 @@
<groupId>org.webjars</groupId>
<artifactId>json2</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
<exclusion>
<groupId>com.darrinholst</groupId>
<artifactId>sass-java-gems</artifactId>
Expand Down Expand Up @@ -501,7 +536,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<scope>runtime</scope>
<!--<scope>runtime</scope>-->
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down Expand Up @@ -540,7 +575,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down

0 comments on commit 479e3cf

Please sign in to comment.