diff --git a/libraries-2/src/main/resources/META-INF/kmodule.xml b/libraries-2/src/main/resources/META-INF/kmodule.xml
index 1b9ce1ce71..9e2597d5de 100644
--- a/libraries-2/src/main/resources/META-INF/kmodule.xml
+++ b/libraries-2/src/main/resources/META-INF/kmodule.xml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/libraries-2/src/main/resources/employeeEmailReport.jrxml b/libraries-2/src/main/resources/employeeEmailReport.jrxml
index ad4aaaac90..1e60344e47 100644
--- a/libraries-2/src/main/resources/employeeEmailReport.jrxml
+++ b/libraries-2/src/main/resources/employeeEmailReport.jrxml
@@ -1,17 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libraries-2/src/main/resources/employeeReport.jrxml b/libraries-2/src/main/resources/employeeReport.jrxml
index 3d2be226fb..434c3e1338 100644
--- a/libraries-2/src/main/resources/employeeReport.jrxml
+++ b/libraries-2/src/main/resources/employeeReport.jrxml
@@ -1,12 +1,16 @@
-
+
- = $P{minSalary} AND $P!{condition}]]>
+ = $P{minSalary} AND $P!{condition}]]>
@@ -44,7 +48,8 @@
-
+
+
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
index e00305d4a2..28b0d26bed 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
+++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
@@ -26,54 +26,54 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration
public class CacheEvictAnnotationIntegrationTest {
- @Configuration
- @EnableCaching
- static class ContextConfiguration {
+ @Configuration
+ @EnableCaching
+ static class ContextConfiguration {
- @Bean
- public CachingService cachingService() {
- return new CachingService();
- }
-
- @Bean
- public CacheManager cacheManager(){
- SimpleCacheManager cacheManager = new SimpleCacheManager();
- List caches = new ArrayList<>();
- caches.add(cacheBean().getObject());
- cacheManager.setCaches(caches );
- return cacheManager;
- }
-
- @Bean
- public ConcurrentMapCacheFactoryBean cacheBean(){
- ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
- cacheFactoryBean.setName("first");
- return cacheFactoryBean;
- }
- }
+ @Bean
+ public CachingService cachingService() {
+ return new CachingService();
+ }
- @Autowired
- CachingService cachingService;
+ @Bean
+ public CacheManager cacheManager() {
+ SimpleCacheManager cacheManager = new SimpleCacheManager();
+ List caches = new ArrayList<>();
+ caches.add(cacheBean().getObject());
+ cacheManager.setCaches(caches);
+ return cacheManager;
+ }
- @Before
- public void before() {
- cachingService.putToCache("first", "key1", "Baeldung");
- cachingService.putToCache("first", "key2", "Article");
- }
+ @Bean
+ public ConcurrentMapCacheFactoryBean cacheBean() {
+ ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+ cacheFactoryBean.setName("first");
+ return cacheFactoryBean;
+ }
+ }
- @Test
- public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
- cachingService.evictSingleCacheValue("key1");
- String key1 = cachingService.getFromCache("first", "key1");
- assertThat(key1, is(nullValue()));
- }
+ @Autowired
+ CachingService cachingService;
- @Test
- public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
- cachingService.evictAllCacheValues();
- String key1 = cachingService.getFromCache("first", "key1");
- String key2 = cachingService.getFromCache("first", "key2");
- assertThat(key1, is(nullValue()));
- assertThat(key2, is(nullValue()));
- }
+ @Before
+ public void before() {
+ cachingService.putToCache("first", "key1", "Baeldung");
+ cachingService.putToCache("first", "key2", "Article");
+ }
+
+ @Test
+ public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
+ cachingService.evictSingleCacheValue("key1");
+ String key1 = cachingService.getFromCache("first", "key1");
+ assertThat(key1, is(nullValue()));
+ }
+
+ @Test
+ public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
+ cachingService.evictAllCacheValues();
+ String key1 = cachingService.getFromCache("first", "key1");
+ String key2 = cachingService.getFromCache("first", "key2");
+ assertThat(key1, is(nullValue()));
+ assertThat(key2, is(nullValue()));
+ }
}
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
index 4b12ed60b6..ffcc88febc 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
+++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
@@ -24,39 +24,39 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class CacheManagerEvictIntegrationTest {
-
- @Configuration
- static class ContextConfiguration {
- @Bean
- public CachingService cachingService() {
- return new CachingService();
- }
-
- @Bean
- public CacheManager cacheManager(){
- SimpleCacheManager cacheManager = new SimpleCacheManager();
- List caches = new ArrayList<>();
- caches.add(cacheBeanFirst().getObject());
- caches.add(cacheBeanSecond().getObject());
- cacheManager.setCaches(caches );
- return cacheManager;
- }
-
- @Bean
- public ConcurrentMapCacheFactoryBean cacheBeanFirst(){
- ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
- cacheFactoryBean.setName("first");
- return cacheFactoryBean;
- }
-
- @Bean
- public ConcurrentMapCacheFactoryBean cacheBeanSecond(){
- ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
- cacheFactoryBean.setName("second");
- return cacheFactoryBean;
- }
- }
+ @Configuration
+ static class ContextConfiguration {
+
+ @Bean
+ public CachingService cachingService() {
+ return new CachingService();
+ }
+
+ @Bean
+ public CacheManager cacheManager() {
+ SimpleCacheManager cacheManager = new SimpleCacheManager();
+ List caches = new ArrayList<>();
+ caches.add(cacheBeanFirst().getObject());
+ caches.add(cacheBeanSecond().getObject());
+ cacheManager.setCaches(caches);
+ return cacheManager;
+ }
+
+ @Bean
+ public ConcurrentMapCacheFactoryBean cacheBeanFirst() {
+ ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+ cacheFactoryBean.setName("first");
+ return cacheFactoryBean;
+ }
+
+ @Bean
+ public ConcurrentMapCacheFactoryBean cacheBeanSecond() {
+ ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+ cacheFactoryBean.setName("second");
+ return cacheFactoryBean;
+ }
+ }
@Autowired
CachingService cachingService;
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index f4132bfb35..032f6a05fc 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -39,11 +39,6 @@
org.springframework.retry
spring-retry
-
- org.springframework.shell
- spring-shell
- ${org.springframework.shell.version}
-
org.springframework
spring-websocket
@@ -104,17 +99,6 @@
guava
${guava.version}
-
- net.sf.jasperreports
- jasperreports
- ${jasperreports.version}
-
-
- commons-logging
- commons-logging
-
-
-
org.springframework
@@ -218,7 +202,6 @@
org.baeldung.sample.App
5.0.6.RELEASE
- 1.2.0.RELEASE
1.3.2
5.2.5.Final
@@ -227,7 +210,6 @@
25.1-jre
3.6
3.6.1
- 6.6.0
2.1.0
3.22.0-GA
diff --git a/spring-core-2/src/main/resources/beanInjection-constructor.xml b/spring-core-2/src/main/resources/beanInjection-constructor.xml
index a0713fd9f8..5a2ffe767c 100644
--- a/spring-core-2/src/main/resources/beanInjection-constructor.xml
+++ b/spring-core-2/src/main/resources/beanInjection-constructor.xml
@@ -1,15 +1,15 @@
-
-
- This is the body of the sample view
+This is the body of the sample view