diff options
| -rw-r--r-- | client/pom.xml | 15 | ||||
| -rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/client/pom.xml b/client/pom.xml index 3dee66f31ec..6f281fddf8c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -63,6 +63,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <finalName>${project.artifactId}-jar-with-dependencies</finalName> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java index 39e6c69f539..463a9cfebae 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java @@ -93,11 +93,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc log.log(LogLevel.DEBUG, () -> "Polled queue and found config " + jrtReq); if (jrtReq.hasUpdatedGeneration()) { setInternalRedeploy(jrtReq.responseIsInternalRedeploy()); - if (jrtReq.hasUpdatedConfig()) { - setNewConfig(jrtReq); - } else { - setGeneration(jrtReq.getNewGeneration()); - } + setNewConfig(jrtReq); } return true; } |