Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CURATOR-503] Update dependencies in January 2019 #301

Merged
merged 2 commits into from
Mar 3, 2019
Merged

[CURATOR-503] Update dependencies in January 2019 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73ce867
Update deps
leventov Dec 11, 2018
518ac56
Improve comment
leventov Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions curator-framework/src/main/java/org/apache/curator/framework/schema/SchemaViolation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.apache.curator.framework.schema;

import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import org.apache.zookeeper.data.ACL;
import java.util.Arrays;
Expand Down Expand Up @@ -148,6 +147,6 @@ public String toString()

private static String toString(Schema schema, String violation, ViolatorData violatorData)
{
return Objects.firstNonNull(violation, "") + " " + schema + " " + violatorData;
return (violation != null ? violation : "") + " " + schema + " " + violatorData;
}
}
2 changes: 1 addition & 1 deletion ...ecipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ public void testFlush() throws Exception
try
{
final AtomicBoolean firstTime = new AtomicBoolean(true);
queue = new DistributedQueue<TestQueueItem>(client, null, serializer, "/test", new ThreadFactoryBuilder().build(), MoreExecutors.sameThreadExecutor(), 10, true, null, QueueBuilder.NOT_SET, true, 0)
queue = new DistributedQueue<TestQueueItem>(client, null, serializer, "/test", new ThreadFactoryBuilder().build(), MoreExecutors.directExecutor(), 10, true, null, QueueBuilder.NOT_SET, true, 0)
{
@Override
void internalCreateNode(final String path, final byte[] bytes, final BackgroundCallback callback) throws Exception
Expand Down
37 changes: 37 additions & 0 deletions curator-x-discovery-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,41 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk-9-plus</id>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm -1 on this change. I'd rather see a comprehensive Java 11 PR (we have a Jira for this already). Java 9 is not an LTS release.

Copy link
Member Author

@leventov leventov Feb 6, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This profile is activated whenever the test runtime is Java 9+ (including Java 11). I could change this to Java 11+, so that Java 9 and 10 are not supported at all, but I don't see much sense in doing this. In fact, that would break the workflow for people who want to run some tests locally and for whatever reason they happen to have Java 9 or 10, but not Java 11 installed (that was my case).

<activation>
<jdk>[1.9,)</jdk>
</activation>
<dependencies>
<!-- The following dependencies are added to make tests work with JDK 9 or later,
as per this answer: https://stackoverflow.com/questions/43574426#43574427 -->

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
56 changes: 42 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,31 @@

<!-- versions -->
<zookeeper-version>3.5.4-beta</zookeeper-version>
<maven-project-info-reports-plugin-version>2.9</maven-project-info-reports-plugin-version>
<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
<maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
<maven-bundle-plugin-version>4.1.0</maven-bundle-plugin-version>
<maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
<doxia-module-confluence-version>1.8</doxia-module-confluence-version>
<maven-license-plugin-version>1.9.0</maven-license-plugin-version>
<javassist-version>3.20.0-GA</javassist-version>
<javassist-version>3.24.1-GA</javassist-version>
<commons-math-version>2.2</commons-math-version>
<jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
<jackson-version>2.7.3</jackson-version>
<jersey-version>1.18.1</jersey-version>
<jackson-version>2.9.8</jackson-version>
<jersey-version>1.19.4</jersey-version>
<!-- Upgrading to Jersey 2.x is difficult and of unclear benefits, see
https://stackoverflow.com/questions/17098341#22033825 -->
<jsr311-api-version>1.1.1</jsr311-api-version>
<!-- See https://stackoverflow.com/questions/43574426#comment93992044_43574427 -->
<jaxb-version>2.2.11</jaxb-version>
<javax-activation-version>1.1.1</javax-activation-version>
<jetty-version>6.1.26</jetty-version>
<scannotation-version>1.0.2</scannotation-version>
<resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version>
<guava-version>20.0</guava-version>
<testng-version>6.10</testng-version>
<swift-version>0.18.0</swift-version>
<dropwizard-version>0.7.0</dropwizard-version>
<maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
<slf4j-version>1.7.6</slf4j-version>
<!-- resteasy-jaxrs dependency cannot be higher than 2.x for compatibility with Jersey 1.x -->
<resteasy-jaxrs-version>2.3.5.Final</resteasy-jaxrs-version>
<guava-version>27.0.1-jre</guava-version>
<testng-version>6.14.3</testng-version>
<swift-version>0.23.1</swift-version>
<dropwizard-version>1.3.7</dropwizard-version>
<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
<slf4j-version>1.7.25</slf4j-version>
<clirr-maven-plugin-version>2.8</clirr-maven-plugin-version>

<!-- OSGi Properties -->
Expand Down Expand Up @@ -431,6 +436,30 @@
<version>${jsr311-api-version}</version>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb-version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-version}</version>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax-activation-version}</version>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
Expand Down Expand Up @@ -526,7 +555,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin-version}</version>
</plugin>

<plugin>
Expand Down