Skip to content

Commit b9f52f3

Browse files
committed
passing build
1 parent 7766a32 commit b9f52f3

File tree

4 files changed

+2
-25
lines changed

4 files changed

+2
-25
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ springBootVersion=1.3.0.RELEASE
44
jerseyVersion=2.22.1
55
grizzlyVersion=2.3.23
66
simpleReactVersion=0.99.5
7-
cyclopsVersion=6.2.1
7+
cyclopsVersion=6.2.2
88
jacksonVersion=2.6.3
99
hibernateVersion=5.0.5.Final
1010
hibernateValidator=5.2.2.Final

micro-machine-stats/build.gradle

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,14 @@
1-
apply plugin: 'groovy'
2-
31
description = 'micro-machine-stats'
42
dependencies {
53
compile 'io.kamon:sigar-loader:1.6.6-rev002'
64
compile group: 'org.fusesource', name: 'sigar', version:'1.6.4'
75
compile group: 'org.fusesource', name: 'sigar', version:'1.6.4', classifier:'native'
86
compile project(':micro-core')
9-
compile group: 'org.codehaus.groovy', name: 'groovy-all', version:'2.3.3'
107

118
testCompile project(':micro-grizzly-with-jersey')
129

1310
}
1411

15-
test {
16-
systemProperty 'java.library.path',"./lib"
17-
18-
}
19-
20-
sourceSets {
21-
main {
22-
java { srcDirs = []}
23-
groovy { srcDirs = ['src/main/java'] }
24-
resources { srcDir 'src/main/resources' }
25-
}
26-
27-
test {
28-
java { srcDirs = []}
29-
groovy { srcDirs = ['src/test/java'] }
30-
resources { srcDir 'src/test/resources' }
31-
}
32-
33-
}
3412

3513
modifyPom {
3614
project {

micro-machine-stats/src/main/java/com/aol/micro/server/machine/stats/sigar/StatsServletContextListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import kamon.sigar.SigarProvisioner;
99

10-
import org.hyperic.sigar.Sigar;
1110
import org.slf4j.Logger;
1211
import org.slf4j.LoggerFactory;
1312

micro-transactions/src/main/java/com/aol/micro/server/transactions/TransactionFlow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class TransactionFlow<T,R> {
3434
* An exception in the mapping process will cause Rollback
3535
* Transaction will be completed once the entire flow has completed
3636
* <pre>
37-
* {code
37+
* {@code
3838
* Integer result = TransactionFlow.<Integer>of(transactionTemplate)
3939
.map(this::load)
4040
.map(this::save)

0 commit comments

Comments
 (0)