From 8240c0db96f2c44867cb846ff7966532dde447af Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 20 Feb 2016 16:00:12 +0100 Subject: [PATCH] #268: Maven plugin and dependency updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit maven-compiler-plugin 3.1 → 3.5.1 maven-project-info-reports-plugin 2.7 → 2.8.1 maven-scm-publish-plugin 1.0 → 1.1 jdom2 2.0.5 → 2.0.6 slf4j-api 1.7.10 → 1.7.16 logback-classic 1.1.2 → 1.1.3 commons-lang3 3.3.2 → 3.4 --- pom.xml | 525 +++++++++--------- .../certiorem/hub/DeltaSyndFeedInfoTest.java | 103 ++-- 2 files changed, 309 insertions(+), 319 deletions(-) diff --git a/pom.xml b/pom.xml index f9f21cd..d861558 100644 --- a/pom.xml +++ b/pom.xml @@ -1,257 +1,268 @@ - - - 4.0.0 - - - org.sonatype.oss - oss-parent - 9 - - - com.rometools - rome-parent - 1.6.0-SNAPSHOT - pom - - - rome - rome-certiorem - rome-certiorem-webapp - rome-fetcher - rome-modules - rome-opml - rome-propono - rome-utils - - - rome-parent - - Parent for all ROME projects - - http://rometools.github.io/rome-parent/ - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:git:ssh://github.com/rometools/rome-parent.git - scm:git:ssh://git@github.com/rometools/rome-parent.git - https://github.com/rometools/rome-parent - - - - - Patrick Gotthard - patrick@patrick-gotthard.de - http://www.patrick-gotthard.de - +1 - - - - - UTF-8 - UTF-8 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.0 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - - - org.apache.felix - maven-bundle-plugin - 3.0.1 - - - bundle - package - - bundle - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - org.apache.felix - maven-bundle-plugin - - - - com.rometools.rome.feed, - com.rometools.rome.feed.atom, - com.rometools.rome.feed.impl, - com.rometools.rome.feed.module, - com.rometools.rome.feed.rss, - com.rometools.rome.feed.synd, - com.rometools.rome.io, - - - org.jdom2, - org.jdom2.filter, - org.jdom2.input, - org.jdom2.input.sax, - org.jdom2.output, - org.slf4j, - org.w3c.dom, - org.xml.sax - - <_exportcontents>com.rometools.utils - rome-utils - - - - - - - - - - - org.jdom - jdom2 - 2.0.5 - - - - org.slf4j - slf4j-api - 1.7.10 - - - ch.qos.logback - logback-classic - 1.1.2 - - - - junit - junit - 4.12 - - - - org.hamcrest - hamcrest-library - 1.3 - - - - javax.servlet - servlet-api - 2.5 - - - javax.servlet.jsp - jsp-api - 2.1 - - - javax.persistence - persistence-api - 1.0.2 - - - - com.google.inject.extensions - guice-servlet - 2.0 - - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - commons-beanutils - commons-beanutils - 1.9.2 - - - - jetty - jetty - 4.2.12 - - - - org.apache.xmlrpc - xmlrpc-client - 3.1.3 - - - - net.oauth.core - oauth - 20100527 - - - - - + + + 4.0.0 + + + org.sonatype.oss + oss-parent + 9 + + + com.rometools + rome-parent + 1.6.0-SNAPSHOT + pom + + + rome + rome-certiorem + rome-certiorem-webapp + rome-fetcher + rome-modules + rome-opml + rome-propono + rome-utils + + + rome-parent + + Parent for all ROME projects + + http://rometools.github.io/rome-parent/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:ssh://github.com/rometools/rome-parent.git + scm:git:ssh://git@github.com/rometools/rome-parent.git + https://github.com/rometools/rome-parent + + + + + Patrick Gotthard + patrick@patrick-gotthard.de + http://www.patrick-gotthard.de + +1 + + + + + UTF-8 + UTF-8 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.8.1 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.1 + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + + + org.apache.felix + maven-bundle-plugin + 3.0.1 + + + bundle + package + + bundle + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.apache.felix + maven-bundle-plugin + + + + com.rometools.rome.feed, + com.rometools.rome.feed.atom, + com.rometools.rome.feed.impl, + com.rometools.rome.feed.module, + com.rometools.rome.feed.rss, + com.rometools.rome.feed.synd, + com.rometools.rome.io, + + + org.jdom2, + org.jdom2.filter, + org.jdom2.input, + org.jdom2.input.sax, + org.jdom2.output, + org.slf4j, + org.w3c.dom, + org.xml.sax + + <_exportcontents>com.rometools.utils + rome-utils + + + + + + + + + + + org.jdom + jdom2 + 2.0.6 + + + + org.slf4j + slf4j-api + 1.7.16 + + + ch.qos.logback + logback-classic + 1.1.3 + + + + junit + junit + 4.12 + + + + org.hamcrest + hamcrest-library + 1.3 + + + + javax.servlet + servlet-api + 2.5 + + + javax.servlet.jsp + jsp-api + 2.1 + + + javax.persistence + persistence-api + 1.0.2 + + + + com.google.inject.extensions + guice-servlet + 2.0 + + + + commons-httpclient + commons-httpclient + 3.1 + + + org.apache.commons + commons-lang3 + 3.4 + + + commons-beanutils + commons-beanutils + 1.9.2 + + + + jetty + jetty + 4.2.12 + + + + org.apache.xmlrpc + xmlrpc-client + 3.1.3 + + + + net.oauth.core + oauth + 20100527 + + + + + diff --git a/rome-certiorem/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java b/rome-certiorem/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java index 00b25f0..cd724a5 100644 --- a/rome-certiorem/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java +++ b/rome-certiorem/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java @@ -1,62 +1,41 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rometools.certiorem.hub; - -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.net.URL; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import com.rometools.certiorem.hub.DeltaFeedInfoCache; -import com.rometools.fetcher.impl.HashMapFeedInfoCache; -import com.rometools.fetcher.impl.HttpURLFeedFetcher; -import com.rometools.rome.feed.synd.SyndEntry; -import com.rometools.rome.feed.synd.SyndFeed; - -/** - * - * @author najmi - */ -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 - public void testGetSyndFeed() throws Exception { - - feed = feedFetcher.retrieveFeed(getFeedUrl()); - List entries = feed.getEntries(); - assertTrue(!entries.isEmpty()); - - // Fetch again and this time the entries should be empty as none have - // changed. - feed = feedFetcher.retrieveFeed(getFeedUrl()); - entries = feed.getEntries(); - assertTrue(entries.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; - } - -} +/* + * To change this template, choose Tools | Templates and open the template in the editor. + */ +package com.rometools.certiorem.hub; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.net.URL; +import java.util.List; + +import org.junit.Test; + +import com.rometools.fetcher.impl.HashMapFeedInfoCache; +import com.rometools.fetcher.impl.HttpURLFeedFetcher; +import com.rometools.rome.feed.synd.SyndEntry; +import com.rometools.rome.feed.synd.SyndFeed; + +public class DeltaSyndFeedInfoTest { + + @Test + public void testGetSyndFeed() throws Exception { + + final URL url = new URL("https://news.google.com/news?pz=1&cf=all&ned=us&hl=en&output=rss"); + + final DeltaFeedInfoCache feedInfoCache = new DeltaFeedInfoCache(new HashMapFeedInfoCache()); + final HttpURLFeedFetcher feedFetcher = new HttpURLFeedFetcher(feedInfoCache); + + // the first time the feed should not be empty + final SyndFeed firstFeed = feedFetcher.retrieveFeed(url); + final List 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 secondEntries = secondFeed.getEntries(); + assertTrue(secondEntries.isEmpty()); + + } + +}