Skip to content

Commit eab5f3f

Browse files
johnmccleanjohnmcclean
committed
Merge pull request aol#175 from aol/cylcops-upgrade
cyclops upgrade, tomcat version bump, micro-javaslang returns
2 parents 8acfe69 + b057451 commit eab5f3f

File tree

31 files changed

+387
-700
lines changed

31 files changed

+387
-700
lines changed

‎gradle.properties

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ springVersion=4.2.5.RELEASE
33
springBootVersion=1.3.3.RELEASE
44
jerseyVersion=2.22.2
55
grizzlyVersion=2.3.24
6-
cyclopsReactVersion=1.0.0-RC2.2
6+
cyclopsReactVersion=1.0.0-RC3
7+
cyclopsVersion=8.0.0
78
hamcrestVersion=1.3
8-
jacksonVersion=2.6.3
99
hibernateVersion=5.0.5.Final
1010
hibernateValidator=5.2.2.Final
1111
springDataJPA=1.9.1.RELEASE
1212
guavaVersion=19.0
13-
javaslangDatatypeVersion=2.0.0-RC2
14-
javaslangVersion=2.0.0-RC2
13+
javaslangDatatypeVersion=2.0.2
14+
javaslangVersion=2.0.2
15+
jacksonVersion=2.6.3
1516
guavaDatatypeVersion=2.6.3
1617
logbackVersion=1.1.3
1718
slf4jVersion=1.7.13
@@ -26,3 +27,4 @@ ebayCORSVersion=1.0.1
2627
dbcp2Version=2.1.1
2728
log4jVersion=1.2.17
2829
s3Version=1.10.42
30+
tomcatVersion=9.0.0.M4

‎micro-grizzly-with-jersey/src/test/java/app/spring/com/aol/micro/server/MyBean.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
import javax.inject.Inject;
44

5+
import org.springframework.beans.factory.annotation.Value;
6+
57
import lombok.Getter;
68

79
@Getter
810
public class MyBean {
911

12+
public enum One{one,two};
13+
@Value("${one:one}")
14+
One one;
1015
@Inject
1116
private MyDependency injected;
1217
}

‎micro-guava/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
description = 'micro-guava'
22
dependencies {
3-
compile 'com.google.guava:guava:'+guavaVersion
3+
compile 'com.aol.cyclops:cyclops-guava:'+cyclopsVersion
44
compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava:'+guavaDatatypeVersion
55

66
compile project(':micro-core')

‎micro-jackson-configuration/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
description = 'micro-jackson-configuration'
22
dependencies {
3-
43
compile project(':micro-core')
54

65
}

‎micro-jackson-configuration/src/main/java/com/aol/micro/server/jackson/CoreJacksonConfigurator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.springframework.beans.factory.annotation.Value;
77
import org.springframework.stereotype.Component;
88

9+
import com.aol.cyclops.control.ReactiveSeq;
910
import com.aol.micro.server.PluginLoader;
1011
import com.fasterxml.jackson.annotation.JsonInclude.Include;
1112
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,6 +21,8 @@ public CoreJacksonConfigurator(@Value("${jackson.serialization:NON_NULL}")Includ
2021
this.inc = Optional.ofNullable(inc);
2122
}
2223
public void accept(ObjectMapper mapper) {
24+
25+
2326
JaxbAnnotationModule module = new JaxbAnnotationModule();
2427
// configure as necessary
2528
inc.map(include->mapper.setSerializationInclusion(include));

‎micro-javaslang/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ repositories {
55
description = 'micro-javaslang'
66
dependencies {
77

8-
compile "com.javaslang:javaslang:$javaslangVersion"
9-
compile project(':micro-jackson-configuration')
10-
11-
compile "com.javaslang:javaslang-jackson:$javaslangDatatypeVersion"
128
compile 'com.aol.cyclops:cyclops-javaslang:'+cyclopsVersion
9+
compile project(':micro-jackson-configuration')
10+
compile "io.javaslang:javaslang-jackson:$javaslangDatatypeVersion"
1311
compile project(':micro-core')
1412
testCompile project(':micro-grizzly')
15-
testCompile project(':micro-jersey')
16-
testCompile group: 'com.aol.simplereact', name:'simple-react', version:"${simpleReactVersion}"
13+
testCompile project(':micro-jersey')
1714

1815
}
1916

‎micro-javaslang/src/main/java/com/aol/micro/server/javaslang/JavaslangPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.aol.micro.server.javaslang;
22

3-
import javaslang.jackson.datatype.JavaslangModule;
4-
53
import com.aol.cyclops.data.collections.extensions.persistent.PSetX;
64
import com.aol.micro.server.Plugin;
75
import com.fasterxml.jackson.databind.Module;
86

7+
import javaslang.jackson.datatype.JavaslangModule;
8+
99
/**
1010
*
1111
* Collections of Spring configuration classes (Classes annotated with @Configuration)

‎micro-javaslang/src/main/java/com/aol/micro/server/javaslang/reactive/JavaslangPipes.java

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)