Merge pull request #269 from rometools/ROME-268-plugin-and-dependency-updates
#268: Maven plugin and dependency updates
This commit is contained in:
commit
e3797e09f4
2 changed files with 309 additions and 319 deletions
31
pom.xml
31
pom.xml
|
@ -65,7 +65,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.1</version>
|
<version>3.5.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.6</source>
|
<source>1.6</source>
|
||||||
<target>1.6</target>
|
<target>1.6</target>
|
||||||
|
@ -78,11 +78,23 @@
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-scm-publish-plugin</artifactId>
|
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||||
<version>1.0</version>
|
<version>2.8.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- The following plugin doesn't modify the build. It is
|
<plugin>
|
||||||
only used to hide irrelevant warnings in Eclipse -->
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>2.8.2</version>
|
||||||
|
<configuration>
|
||||||
|
<deployAtEnd>true</deployAtEnd>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-scm-publish-plugin</artifactId>
|
||||||
|
<version>1.1</version>
|
||||||
|
</plugin>
|
||||||
|
<!-- The following plugin doesn't modify the build. It is only used to hide irrelevant warnings in Eclipse -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.m2e</groupId>
|
<groupId>org.eclipse.m2e</groupId>
|
||||||
<artifactId>lifecycle-mapping</artifactId>
|
<artifactId>lifecycle-mapping</artifactId>
|
||||||
|
@ -130,7 +142,6 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||||
<version>2.7</version>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.felix</groupId>
|
<groupId>org.apache.felix</groupId>
|
||||||
|
@ -170,18 +181,18 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jdom</groupId>
|
<groupId>org.jdom</groupId>
|
||||||
<artifactId>jdom2</artifactId>
|
<artifactId>jdom2</artifactId>
|
||||||
<version>2.0.5</version>
|
<version>2.0.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Logging -->
|
<!-- Logging -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>1.7.10</version>
|
<version>1.7.16</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ch.qos.logback</groupId>
|
<groupId>ch.qos.logback</groupId>
|
||||||
<artifactId>logback-classic</artifactId>
|
<artifactId>logback-classic</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.1.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- JUnit -->
|
<!-- JUnit -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -226,7 +237,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>3.3.2</version>
|
<version>3.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-beanutils</groupId>
|
<groupId>commons-beanutils</groupId>
|
||||||
|
|
|
@ -1,62 +1,41 @@
|
||||||
/*
|
/*
|
||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates and open the template in the editor.
|
||||||
* and open the template in the editor.
|
|
||||||
*/
|
*/
|
||||||
package com.rometools.certiorem.hub;
|
package com.rometools.certiorem.hub;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import com.rometools.certiorem.hub.DeltaFeedInfoCache;
|
|
||||||
import com.rometools.fetcher.impl.HashMapFeedInfoCache;
|
import com.rometools.fetcher.impl.HashMapFeedInfoCache;
|
||||||
import com.rometools.fetcher.impl.HttpURLFeedFetcher;
|
import com.rometools.fetcher.impl.HttpURLFeedFetcher;
|
||||||
import com.rometools.rome.feed.synd.SyndEntry;
|
import com.rometools.rome.feed.synd.SyndEntry;
|
||||||
import com.rometools.rome.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author najmi
|
|
||||||
*/
|
|
||||||
public class DeltaSyndFeedInfoTest {
|
public class DeltaSyndFeedInfoTest {
|
||||||
|
|
||||||
private DeltaFeedInfoCache feedInfoCache;
|
|
||||||
private HttpURLFeedFetcher feedFetcher;
|
|
||||||
private SyndFeed feed;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
feedInfoCache = new DeltaFeedInfoCache(new HashMapFeedInfoCache());
|
|
||||||
feedFetcher = new HttpURLFeedFetcher(feedInfoCache);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test of getSyndFeed method, of class DeltaSyndFeedInfo.
|
|
||||||
*/
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetSyndFeed() throws Exception {
|
public void testGetSyndFeed() throws Exception {
|
||||||
|
|
||||||
feed = feedFetcher.retrieveFeed(getFeedUrl());
|
final URL url = new URL("https://news.google.com/news?pz=1&cf=all&ned=us&hl=en&output=rss");
|
||||||
List<SyndEntry> entries = feed.getEntries();
|
|
||||||
assertTrue(!entries.isEmpty());
|
|
||||||
|
|
||||||
// Fetch again and this time the entries should be empty as none have
|
final DeltaFeedInfoCache feedInfoCache = new DeltaFeedInfoCache(new HashMapFeedInfoCache());
|
||||||
// changed.
|
final HttpURLFeedFetcher feedFetcher = new HttpURLFeedFetcher(feedInfoCache);
|
||||||
feed = feedFetcher.retrieveFeed(getFeedUrl());
|
|
||||||
entries = feed.getEntries();
|
// the first time the feed should not be empty
|
||||||
assertTrue(entries.isEmpty());
|
final SyndFeed firstFeed = feedFetcher.retrieveFeed(url);
|
||||||
}
|
final List<SyndEntry> firstEntries = firstFeed.getEntries();
|
||||||
|
assertFalse(firstEntries.isEmpty());
|
||||||
|
|
||||||
|
// fetch once again and this time the entries should be empty because nothing has changed
|
||||||
|
final SyndFeed secondFeed = feedFetcher.retrieveFeed(url);
|
||||||
|
final List<SyndEntry> secondEntries = secondFeed.getEntries();
|
||||||
|
assertTrue(secondEntries.isEmpty());
|
||||||
|
|
||||||
private URL getFeedUrl() throws IOException {
|
|
||||||
final URL feedUrl = new URL("http://news.google.com/news?pz=1&cf=all&ned=us&hl=en&output=rss");
|
|
||||||
// URL feedUrl = new
|
|
||||||
// URL("http://newsrss.bbc.co.uk/rss/newsonline_world_edition/front_page/rss.xml");
|
|
||||||
return feedUrl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue