Skip to content

#7: upgraded to Java 11, Spring Boot 2.1 #8

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

Merged
mrazjava merged 1 commit into from
Feb 4, 2019
Merged

#7: upgraded to Java 11, Spring Boot 2.1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion moo-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-api</artifactId>
<name>Moo API</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-client-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-client-jms</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion moo-client-socket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-client-socket</artifactId>
<description>Moo socket client (requires socket server)</description>
Expand Down
3 changes: 3 additions & 0 deletions moo-client-socket/src/main/java/pl/zimowski/moo/client/socket/ServerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public void run() {
catch (IOException | ClassNotFoundException e) {
log.error("unexpected connection error: {}; aborting!", e.getMessage());
}
catch(Exception e) {
log.error("unexpected error: {}; aborting!", e);
}

if (hardExit) {
System.exit(MAX_PRIORITY);
Expand Down
3 changes: 2 additions & 1 deletion moo-client-socket/src/test/java/pl/zimowski/moo/client/socket/ServerListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doThrow;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -75,7 +76,7 @@ public ServerEvent answer(InvocationOnMock invocation) throws Throwable {
@Test
public void shouldExitOnIOException() {

Mockito.doThrow(IOException.class).when(socket).isInputShutdown();
doThrow(RuntimeException.class).when(socket).isInputShutdown();
ServerListener serverListener = new ServerListener(socket, null);

serverListener.setHardExit(false);
Expand Down
2 changes: 1 addition & 1 deletion moo-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-commons</artifactId>
<name>Moo Commons</name>
Expand Down
6 changes: 5 additions & 1 deletion moo-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-jms</artifactId>
<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion moo-jms/src/main/java/pl/zimowski/moo/jms/JmsGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public void stop() {
try {
session.close();
}
catch(JMSException e) {
catch(Exception e) {
log.info("session close: {}", e.getMessage());
}

Expand Down
2 changes: 1 addition & 1 deletion moo-reports/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-reports</artifactId>
<version>1.0.0-FINAL</version>
Expand Down
2 changes: 1 addition & 1 deletion moo-server-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-server-commons</artifactId>
<name>Moo Server (commons)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-server-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-server-jms</artifactId>
<name>Moo Server (jms)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-server-jms/src/test/java/pl/zimowski/moo/server/jms/JmsChatServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void shouldStartAndExit() {
@Test
public void shouldStartAndAbortOnJmsException() {

doThrow(JMSException.class).when(jms).stop();
doThrow(RuntimeException.class).when(jms).stop();

systemInMock.provideLines("moo:exit");
chat.start();
Expand Down
2 changes: 1 addition & 1 deletion moo-server-socket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-server-socket</artifactId>
<name>Moo Server (socket)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-test-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-test-utils</artifactId>
<name>Moo Test (utils)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-ui-shell/moo-ui-shell-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo-ui-shell</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-ui-shell-commons</artifactId>
<name>Moo UI (shell: commons)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-ui-shell/moo-ui-shell-reader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo-ui-shell</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-ui-shell-reader</artifactId>
<name>Moo UI (shell: reader)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-ui-shell/moo-ui-shell-writer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo-ui-shell</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-ui-shell-writer</artifactId>
<name>Moo UI (shell: writer)</name>
Expand Down
2 changes: 1 addition & 1 deletion moo-ui-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
</parent>
<artifactId>moo-ui-shell</artifactId>
<packaging>pom</packaging>
Expand Down
50 changes: 38 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>pl.zimowski</groupId>
<artifactId>moo</artifactId>
<version>1.3.0-FINAL</version>
<version>2.0.0-FINAL</version>
<packaging>pom</packaging>
<developers>
<developer>
Expand All @@ -22,8 +22,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

Expand Down Expand Up @@ -53,15 +53,35 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Jacoco prepare-agent builds some command-line params without -->
<!-- which jacoco will not instrument. Hence it is important to add -->
<!-- those command-line params here (${argLine} holds those params) -->
<!--
<argLine>${argLine} -Xms256m -Xmx2048m</argLine>
<forkCount>1</forkCount>
<runOrder>random</runOrder>
-->
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<executions>
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand All @@ -79,7 +99,7 @@
</execution>
</executions>
</plugin>

-->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
Expand Down Expand Up @@ -323,7 +343,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.7.22</version>
<version>2.23.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -355,7 +375,12 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
<version>2.0</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
Expand Down Expand Up @@ -473,11 +498,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<moo.version>1.3.0-FINAL</moo.version>
<java.version>11</java.version>
<moo.version>2.0.0-FINAL</moo.version>
<weld.version>2.4.4.Final</weld.version>
<deltaspike.version>1.7.2</deltaspike.version>
<spring-boot.version>1.5.6.RELEASE</spring-boot.version>
<spring.version>4.3.11.RELEASE</spring.version>
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
<spring.version>5.1.4.RELEASE</spring.version>
<cxf.version>3.1.12</cxf.version>
</properties>
<inceptionYear>2017</inceptionYear>
Expand Down