Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Upgrade versions of several libraries:
* checkstyle
* guava
* hppc
* jmh
* logback
* slf4j
  • Loading branch information
motlin committed Apr 2, 2017
1 parent d42137a commit c97a3bc
Show file tree
Hide file tree
Showing 14 changed files with 68 additions and 54 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions jmh-tests/jmh-tests.iml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.openjdk.jmh:jmh-core:1.11.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.openjdk.jmh:jmh-generator-annprocess:1.11.3" level="project" />
<orderEntry type="module" module-name="eclipse-collections-api" />
<orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
<orderEntry type="module" module-name="eclipse-collections" />
Expand All @@ -22,16 +23,16 @@
<orderEntry type="module" module-name="jmh-scala-tests" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.11.7" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.openjdk.jmh:jmh-core:1.11.3" level="project" />
<orderEntry type="library" name="Maven: org.openjdk.jmh:jmh-core:1.18" level="project" />
<orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.openjdk.jmh:jmh-generator-annprocess:1.11.3" level="project" />
<orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.openjdk.jmh:jmh-generator-annprocess:1.18" level="project" />
<orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.2" level="project" />
<orderEntry type="library" name="Maven: net.openhft:koloboke-api-jdk8:0.6.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: net.openhft:koloboke-impl-jdk8:0.6.8" level="project" />
<orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
</component>
</module>
</module>
6 changes: 3 additions & 3 deletions jmh-tests/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright (c) 2016 Goldman Sachs.
~ Copyright (c) 2017 Goldman Sachs.
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the Eclipse Public License v1.0
~ and Eclipse Distribution License v. 1.0 which accompany this distribution.
Expand All @@ -27,7 +27,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
<jmh.version>1.12</jmh.version>
<jmh.version>1.18</jmh.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
<version>0.7.1</version>
<version>0.7.2</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions performance-tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2016 Goldman Sachs.
~ Copyright (c) 2017 Goldman Sachs.
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the Eclipse Public License v1.0
~ and Eclipse Distribution License v. 1.0 which accompany this distribution.
Expand Down Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.3</version>
<version>1.2.3</version>
</dependency>

</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2016 Goldman Sachs.
~ Copyright (c) 2017 Goldman Sachs.
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the Eclipse Public License v1.0
~ and Eclipse Distribution License v. 1.0 which accompany this distribution.
Expand Down Expand Up @@ -120,12 +120,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<slf4j.version>1.7.14</slf4j.version>
<slf4j.version>1.7.25</slf4j.version>
<clover.version>4.0.6</clover.version>
<scala.version>2.11.7</scala.version>
<guava.version>19.0</guava.version>
<guava.version>21.0</guava.version>
<trove4j.version>3.0.3</trove4j.version>
<checkstyle.version>6.15</checkstyle.version>
<checkstyle.version>7.6.1</checkstyle.version>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
<findbugs.plugin.version>3.0.3</findbugs.plugin.version>
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
Expand Down
8 changes: 4 additions & 4 deletions unit-tests-java8/unit-tests-java8.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
Expand All @@ -17,8 +17,8 @@
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="module" module-name="junit-trait-runner" scope="TEST" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-nop:1.7.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
</component>
</module>
</module>

0 comments on commit c97a3bc

Please sign in to comment.