Skip to content

Commit

Permalink
Merge pull request jhipster#6 from erikkemperman/master
Browse files Browse the repository at this point in the history 
Some polishing
  • Loading branch information
@jdubois
jdubois authored Oct 10, 2017
2 parents 2d2c0e0 + bdc353b commit aaa5040
Showing 1 changed file with 89 additions and 52 deletions.
141 changes: 89 additions & 52 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>io.spring.platform</groupId>
<artifactId>platform-bom</artifactId>
<version>Brussels-SR5</version>
<relativePath/>
<relativePath />
</parent>

<groupId>io.github.jhipster</groupId>
Expand All @@ -19,9 +19,18 @@

<properties>
<!-- Build properties -->
<java.version>1.8</java.version>
<maven.version>3.0.0</maven.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

<!-- Plugin versions -->
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>

<!-- Library properties -->
<!-- Dependency versions -->
<assertj.version>3.6.2</assertj.version>
<awaitility.version>2.0.0</awaitility.version>
<bucket4j.version>3.0.1</bucket4j.version>
Expand All @@ -43,15 +52,12 @@
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
<logstash-logback-encoder.version>4.11</logstash-logback-encoder.version>
<lz4.version>1.3.0</lz4.version>
<mapstruct.version>1.1.0.Final</mapstruct.version>
<metrics-spring.version>3.1.3</metrics-spring.version>
<mongobee.version>0.12</mongobee.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
<oracle-jdbc.version>12.1.0.2</oracle-jdbc.version>
<problem-spring-web.version>0.20.1</problem-spring-web.version>
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
<springfox.version>2.7.0</springfox.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<!-- The spring-boot version should match the one in
https://github.com/spring-io/platform/blob/v${project.parent.version}/platform-bom/pom.xml -->
<spring-boot.version>1.5.7.RELEASE</spring-boot.version>
Expand All @@ -61,6 +67,8 @@
<spring-cloud-netflix.version>1.3.2.RELEASE</spring-cloud-netflix.version>
<spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
<spring-social-google.version>1.0.0.RELEASE</spring-social-google.version>
<springfox.version>2.7.0</springfox.version>
<validation-api.version>1.1.0.Final</validation-api.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -180,22 +188,26 @@
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
<version>${lz4.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-annotation</artifactId>
Expand Down Expand Up @@ -356,42 +368,67 @@
<type>pom</type>
<scope>import</scope>
</dependency>

</dependencies>
</dependencyManagement>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</dependencyManagement>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
<configuration>
<rules>
<requireMavenVersion>
<message>You are running an older version of Maven. JHipster requires at least Maven ${maven.version}</message>
<version>[${maven.version},)</version>
</requireMavenVersion>
<requireJavaVersion>
<message>You are running an older version of Java. JHipster requires at least JDK ${java.version}</message>
<version>[${java.version}.0,)</version>
</requireJavaVersion>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit aaa5040

Please sign in to comment.