Skip to content
This repository has been archived by the owner on Feb 6, 2018. It is now read-only.

Commit

Permalink
Merge pull request #132 from making/support-spring-boot-1.2
Browse files Browse the repository at this point in the history 
support Spring Boot 1.2.M2
  • Loading branch information
@making
making committed Oct 20, 2014
2 parents ae8dd50 + abdfc68 commit a2f5fd4
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 44 deletions.
72 changes: 36 additions & 36 deletions categolj2-backend.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,40 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.3.4" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.0.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.2.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.1.GA" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.2" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.6.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.1.Final" level="project" />
Expand All @@ -72,15 +72,15 @@
<orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.6.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.8.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.7.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.9.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jetty:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jetty:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:8.1.15.v20140411" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:8.1.15.v20140411" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.15.v20140411" level="project" />
Expand All @@ -99,25 +99,25 @@
<orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.el:2.2.0.v201108011116" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:com.sun.el:2.2.0.v201108011116" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:org.eclipse.jdt.core:3.7.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" />
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.0" level="project" />
<orderEntry type="library" name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-springsecurity3:2.1.1.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.1.7.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.2.0.M2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.0.7.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.terasoluna.gfw:terasoluna-gfw-web:1.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.terasoluna.gfw:terasoluna-gfw-common:1.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-search-orm:4.5.0.Final" level="project" />
Expand Down Expand Up @@ -166,16 +166,16 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.12.2" level="project" />
<orderEntry type="library" name="Maven: org.flywaydb:flyway-core:3.0" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:1.4.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.jadira.usertype:usertype.core:3.1.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.jadira.usertype:usertype.spi:3.1.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.jadira.usertype:usertype.extended:3.1.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
<orderEntry type="library" name="Maven: com.hazelcast:hazelcast:3.2" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.findbugs:annotations:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.hazelcast:hazelcast-spring:3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:1.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:1.2.0.M2" level="project" />
<orderEntry type="library" name="Maven: com.codahale.metrics:metrics-core:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.codahale.metrics:metrics-jvm:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.codahale.metrics:metrics-servlets:3.0.2" level="project" />
Expand Down
26 changes: 22 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.1.7.RELEASE</version>
<version>1.2.0.M2</version>
<relativePath/>
</parent>

Expand All @@ -26,6 +26,14 @@
</properties>

<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<releases>
</releases>
Expand Down Expand Up @@ -55,6 +63,17 @@
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -92,8 +111,8 @@
<artifactId>spring-boot-starter-jetty</artifactId>
<exclusions>
<!--<exclusion>-->
<!--<groupId>org.eclipse.jetty</groupId>-->
<!--<artifactId>jetty-jsp</artifactId>-->
<!--<groupId>org.eclipse.jetty</groupId>-->
<!--<artifactId>jetty-jsp</artifactId>-->
<!--</exclusion>-->
</exclusions>
</dependency>
Expand Down Expand Up @@ -390,7 +409,6 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>mysql</id>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/am/ik/categolj2/config/GuavaCacheConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import am.ik.categolj2.infra.cache.LoggingGuavaCacheManager;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurer;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.interceptor.KeyGenerator;
import org.springframework.cache.interceptor.SimpleKeyGenerator;
Expand All @@ -15,7 +15,7 @@
@Configuration
@EnableCaching
@Profile("cache.guava")
public class GuavaCacheConfiguration implements CachingConfigurer {
public class GuavaCacheConfiguration extends CachingConfigurerSupport {
@Bean
@Override
public CacheManager cacheManager() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/am/ik/categolj2/config/HazelcastCacheConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.spring.cache.HazelcastCacheManager;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurer;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.interceptor.KeyGenerator;
import org.springframework.cache.interceptor.SimpleKeyGenerator;
Expand All @@ -21,7 +21,7 @@
@Configuration
@EnableCaching
@Profile("cache.hazelcast")
public class HazelcastCacheConfiguration implements CachingConfigurer {
public class HazelcastCacheConfiguration extends CachingConfigurerSupport {
@Inject
HazelcastProperties hazelcastProperties;

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/am/ik/categolj2/infra/cache/LoggingCacheAdaptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,10 @@ public void clear() {
logger.debug("[{}]\tclear", name);
targetCache.clear();
}

@Override
public ValueWrapper putIfAbsent(Object key, Object value) {
logger.debug("[{}]\tputIfAbsent key={}", name, key);
return targetCache.putIfAbsent(key, value);
}
}

0 comments on commit a2f5fd4

Please sign in to comment.