Merge remote-tracking branch 'upstream/master'

# Conflicts: # spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java # spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java # spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java # spring-session/jetty-session-demo/src/main/resources/application.properties # spring-session/pom.xml # spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java # spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java
2016-11-12 09:20:18 -07:00
parent 9689d4656a 584ae4167f
commit ca01d230a6
70 changed files with 2481 additions and 208 deletions
@@ -95,6 +95,7 @@
        <module>spring-data-neo4j</module>
        <module>spring-data-redis</module>
        <module>spring-data-rest</module>
+        <module>spring-data-solr</module>
        <module>spring-dispatcher-servlet</module>
        <module>spring-exceptions</module>
        <module>spring-freemarker</module>