diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-26 15:32:55 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-26 15:52:00 +0200 |
| commit | 45248a93901bbdac018a172a9f1db956cba876bf (patch) | |
| tree | 0d54ab5496685d503f7348bb25f052b63fc79d0c /pom.xml | |
| parent | 8d0ec033969eaf7fb0e9672816ce6a85a9a301f0 (diff) | |
| download | sonarqube-45248a93901bbdac018a172a9f1db956cba876bf.tar.gz sonarqube-45248a93901bbdac018a172a9f1db956cba876bf.zip | |
SONAR-7587 end of support of Java 7
- Upgrade to parent 34, which compiles
with java 8 and disable javadoc lints
- Compilation with java 8 on Travis
- Fix ambiguities in assertJ
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -5,7 +5,7 @@ <parent> <groupId>org.sonarsource.parent</groupId> <artifactId>parent</artifactId> - <version>31</version> + <version>34</version> </parent> <groupId>org.sonarsource.sonarqube</groupId> <artifactId>sonarqube</artifactId> @@ -74,7 +74,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.min.version>3.2</maven.min.version> - <jdk.min.version>1.7</jdk.min.version> <timestamp>${maven.build.timestamp}</timestamp> <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format> <license.title>SonarQube</license.title> @@ -803,12 +802,12 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>2.0.0</version> + <version>3.4.1</version> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> - <version>1.3.1</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>xpp3</groupId> @@ -1141,7 +1140,7 @@ <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>enforce-java7</id> + <id>enforce-java8</id> <goals> <goal>enforce</goal> </goals> @@ -1150,7 +1149,7 @@ <requireJavaVersion> <message>To release this project JDK ${jdk.min.version} is required. </message> - <version>[1.7,)</version> + <version>[${jdk.min.version},)</version> </requireJavaVersion> </rules> </configuration> |