Permalink
Browse files

Merge pull request #101 from cereebro/1.2.x

1.2.4
  • Loading branch information...
michaeltecourt committed Feb 22, 2018
2 parents 642dc1f + c99af5f commit 67edfec590dc9b46aa58d4721384737a7138fe10
View
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-core</artifactId>
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-server-spring-boot-starter</artifactId>
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-server-tests</artifactId>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-server</artifactId>
@@ -20,8 +20,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
@@ -41,7 +41,7 @@ public CereebroSystemController(SystemService systemService) {
this.systemService = Objects.requireNonNull(systemService, "SystemService required");
}
@RequestMapping(method = RequestMethod.GET, produces = MediaType.TEXT_HTML_VALUE)
@GetMapping(produces = MediaType.TEXT_HTML_VALUE)
public ModelAndView systemPage() {
System system = systemService.get();
ModelAndView mav = new ModelAndView("cereebro/system");
@@ -54,7 +54,7 @@ public ModelAndView systemPage() {
return mav;
}
@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public System systemJson() {
return systemService.get();
@@ -66,7 +66,7 @@ public static DependencyWheel of(System system) {
final DependencyWheelBuilder builder = DependencyWheel.builder();
List<ComponentRelationships> rels = new ArrayList<>(system.getComponentRelationships());
rels.sort((c1, c2) -> c1.getComponent().asString().toLowerCase().compareTo(c2.getComponent().asString()));
rels.sort((c1, c2) -> c1.getComponent().asString().compareToIgnoreCase(c2.getComponent().asString()));
for (ComponentRelationships rel : rels) {
List<Integer> line = new ArrayList<>();
for (ComponentRelationships potentialDependency : rels) {
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-snitch-spring-boot-starter</artifactId>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
</parent>
<artifactId>cereebro-snitch</artifactId>
View
@@ -4,7 +4,7 @@
<groupId>io.cereebro</groupId>
<artifactId>cereebro</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cereebro</name>
@@ -267,12 +267,12 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.3.0.603</version>
<version>3.4.0.905</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<version>0.8.0</version>
</plugin>
<!-- Spring -->
<plugin>

0 comments on commit 67edfec

Please sign in to comment.