Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feed: Fix imports conflict after cherry-picking

Browse Source
This commit is contained in:
Artem Bilan
2015-04-17 19:25:36 +03:00
parent f385d984f9
commit 2d1b3eb6d4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.integration.feed.inbound;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import java.io.File;
import java.net.URL;
@@ -27,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.integration.Message;
import org.springframework.integration.metadata.PropertiesPersistingMetadataStore;
import com.sun.syndication.feed.synd.SyndEntry;