Update corporate-parent

lwjaiyjk · Jun 22, 2018 · c42010a · c42010a
1 parent f33ca2c
commit c42010a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.opengamma</groupId>
     <artifactId>corporate-parent</artifactId>
-    <version>2.3.0</version>
+    <version>2.5.0</version>
     <relativePath></relativePath>
   </parent>  
   <groupId>com.opengamma.strata</groupId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.opengamma</groupId>
     <artifactId>corporate-parent</artifactId>
-    <version>2.4.1</version>
+    <version>2.5.0</version>
     <relativePath></relativePath>
   </parent>  
   <groupId>com.opengamma.strata</groupId>
@@ -114,18 +114,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${checkstyle.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>com.opengamma</groupId>
-            <artifactId>build-config</artifactId>
-            <version>${build-config.version}</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>run-checkstyle</id>
@@ -135,13 +123,6 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <includeResources>false</includeResources>
-          <includeTestResources>false</includeTestResources>
-          <includeTestSourceDirectory>false</includeTestSourceDirectory>
-          <consoleOutput>true</consoleOutput>
-          <failsOnError>true</failsOnError>
-        </configuration>
       </plugin>
       <!--  obtain git commit -->
       <plugin>
@@ -686,19 +667,15 @@
     <!-- Locate the root directory of the multi-module build -->
     <root.dir>${project.basedir}/..</root.dir>
     <!-- Versions -->
-    <!-- 3.10.0 failed in comparing sets -->
-    <assertj.version>3.9.0</assertj.version>
+    <assertj.version>3.9.0</assertj.version><!-- 3.10.0 failed in comparing sets -->
     <guava.version>25.1-jre</guava.version>
     <jcommander.version>1.72</jcommander.version>
     <joda-convert.version>2.1</joda-convert.version>
     <joda-beans.version>2.2.2</joda-beans.version>
-    <mockito.version>2.18.3</mockito.version>
+    <mockito.version>2.19.0</mockito.version>
     <slf4j.version>1.7.25</slf4j.version>
     <testng.version>6.14.2</testng.version>
     <!-- Properties for maven-checkstyle-plugin -->
-    <checkstyle.version>8.8</checkstyle.version>
-    <build-config.version>2.2.0</build-config.version>
-    <checkstyle.excludes>module-info.java</checkstyle.excludes>
     <checkstyle.config.location>checkstyle/checkstyle-oss.xml</checkstyle.config.location>
     <!-- Properties for maven-javadoc-plugin -->
     <windowtitle>OpenGamma Strata</windowtitle>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.opengamma</groupId>
     <artifactId>corporate-parent</artifactId>
-    <version>2.4.1</version>
+    <version>2.5.0</version>
     <relativePath></relativePath>
   </parent>  
   <groupId>com.opengamma.strata</groupId>