[Git][java-team/rome][upstream] New upstream version 1.12.2
Emmanuel Bourg
gitlab at salsa.debian.org
Sun Jan 26 14:39:37 GMT 2020
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / rome
Commits:
395b594d by Emmanuel Bourg at 2020-01-26T15:14:36+01:00
New upstream version 1.12.2
- - - - -
20 changed files:
- .travis.yml
- Jenkinsfile-release
- Jenkinsfile-snapshot
- pom.xml
- rome-certiorem-webapp/pom.xml
- rome-certiorem/pom.xml
- rome-fetcher/pom.xml
- rome-modules/pom.xml
- rome-modules/src/main/java/com/rometools/modules/itunes/io/ITunesParser.java
- rome-modules/src/test/java/com/rometools/modules/itunes/ITunesParserTest.java
- + rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-capital-yes.xml
- + rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-clean.xml
- + rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-no.xml
- + rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-yes.xml
- rome-opml/pom.xml
- rome-osgi-test/pom.xml
- rome-propono/pom.xml
- rome-utils/pom.xml
- rome/pom.xml
- rome/src/test/java/com/rometools/rome/io/impl/DateParserTest.java
Changes:
=====================================
.travis.yml
=====================================
@@ -1,5 +1,9 @@
language: java
-jdk:
- - oraclejdk8
- - openjdk7
script: mvn verify
+matrix:
+ include:
+ - dist: bionic
+ jdk: openjdk11
+ allow_failures:
+ - dist: bionic
+ jdk: openjdk12
=====================================
Jenkinsfile-release
=====================================
@@ -3,7 +3,7 @@ pipeline {
agent any
tools {
- jdk 'Java 8'
+ jdk 'Java 11'
maven 'Maven 3.5.4'
}
@@ -25,4 +25,4 @@ pipeline {
}
}
-}
\ No newline at end of file
+}
=====================================
Jenkinsfile-snapshot
=====================================
@@ -1,7 +1,7 @@
pipeline {
agent any
tools {
- jdk 'Java 8'
+ jdk 'Java 11'
maven 'Maven 3.5.4'
}
triggers {
@@ -14,4 +14,4 @@ pipeline {
}
}
}
-}
\ No newline at end of file
+}
=====================================
pom.xml
=====================================
@@ -6,7 +6,7 @@
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
<packaging>pom</packaging>
<modules>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.3.0</version>
+ <version>4.2.1</version>
<executions>
<execution>
<id>bundle</id>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.22.2</version>
<executions>
<execution>
<goals>
@@ -163,9 +163,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.1.1</version>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <source>1.6</source>
+ <doclint>none</doclint>
</configuration>
<executions>
<execution>
@@ -207,42 +208,42 @@
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-certiorem</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-certiorem-webapp</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-fetcher</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-modules</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-opml</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-propono</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-utils</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<!-- JDOM -->
<dependency>
@@ -250,6 +251,11 @@
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -340,6 +346,11 @@
<artifactId>wiremock</artifactId>
<version>1.58</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
=====================================
rome-certiorem-webapp/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-certiorem-webapp</artifactId>
=====================================
rome-certiorem/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-certiorem</artifactId>
=====================================
rome-fetcher/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-fetcher</artifactId>
=====================================
rome-modules/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-modules</artifactId>
=====================================
rome-modules/src/main/java/com/rometools/modules/itunes/io/ITunesParser.java
=====================================
@@ -206,7 +206,7 @@ public class ITunesParser implements ModuleParser {
final Element explicit = element.getChild("explicit", ns);
if (explicit != null && explicit.getValue() != null) {
- String explicitValue = explicit.getValue().trim();
+ String explicitValue = explicit.getValue().trim().toLowerCase();
if (EXPLICIT_TRUE.contains(explicitValue)) {
module.setExplicit(true);
=====================================
rome-modules/src/test/java/com/rometools/modules/itunes/ITunesParserTest.java
=====================================
@@ -20,6 +20,7 @@
package com.rometools.modules.itunes;
import java.io.File;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -173,4 +174,30 @@ public class ITunesParserTest extends AbstractTestCase {
assertNull(module.getDuration());
}
+
+ public void testExplicitnessTrue() throws Exception {
+ ArrayList<String> xmlFiles = new ArrayList<String>();
+ xmlFiles.add("explicitness-capital-yes.xml");
+ xmlFiles.add("explicitness-yes.xml");
+
+ for (String xml : xmlFiles) {
+ SyndFeed feed = new SyndFeedInput().build(new XmlReader(getClass().getResource(xml)));
+ FeedInformationImpl module = (FeedInformationImpl) feed.getModule(AbstractITunesObject.URI);
+
+ assertTrue(module.getExplicitNullable());
+ }
+ }
+
+ public void testExplicitnessFalse() throws Exception {
+ ArrayList<String> xmlFiles = new ArrayList<String>();
+ xmlFiles.add("explicitness-no.xml");
+ xmlFiles.add("explicitness-clean.xml");
+
+ for (String xml : xmlFiles) {
+ SyndFeed feed = new SyndFeedInput().build(new XmlReader(getClass().getResource(xml)));
+ FeedInformationImpl module = (FeedInformationImpl) feed.getModule(AbstractITunesObject.URI);
+
+ assertFalse(module.getExplicitNullable());
+ }
+ }
}
=====================================
rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-capital-yes.xml
=====================================
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+ <channel>
+ <itunes:explicit>Yes</itunes:explicit>
+ </channel>
+</rss>
=====================================
rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-clean.xml
=====================================
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+ <channel>
+ <itunes:explicit>clean</itunes:explicit>
+ </channel>
+</rss>
=====================================
rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-no.xml
=====================================
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+ <channel>
+ <itunes:explicit>no</itunes:explicit>
+ </channel>
+</rss>
=====================================
rome-modules/src/test/resources/com/rometools/modules/itunes/explicitness-yes.xml
=====================================
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+ <channel>
+ <itunes:explicit>yes</itunes:explicit>
+ </channel>
+</rss>
=====================================
rome-opml/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-opml</artifactId>
=====================================
rome-osgi-test/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-osgi-test</artifactId>
@@ -63,6 +63,11 @@
<artifactId>rome-fetcher</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -71,31 +76,31 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.4.0</version>
+ <version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>4.8.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>4.8.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>4.8.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.4.5</version>
+ <version>2.6.1</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
rome-propono/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-propono</artifactId>
@@ -45,6 +45,10 @@
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
=====================================
rome-utils/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome-utils</artifactId>
=====================================
rome/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>com.rometools</groupId>
<artifactId>rome-parent</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</parent>
<artifactId>rome</artifactId>
@@ -132,12 +132,6 @@
<artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.11.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
=====================================
rome/src/test/java/com/rometools/rome/io/impl/DateParserTest.java
=====================================
@@ -1,51 +1,26 @@
package com.rometools.rome.io.impl;
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.assertEquals;
+
import java.util.Date;
import java.util.Locale;
-
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
-/**
- * Unit tests for {@link DateParser}.
- *
- * @author <a href="mailto:lutz.horn at posteo.de">Lutz Horn</a>
- *
- */
public class DateParserTest {
- @Before
- public void before() {
- }
-
- @After
- public void after() {
- }
-
- @Test
- public void parseW3CDateTimeIsOk() {
- Date result = DateParser.parseW3CDateTime("2019-06-07T15:27:13+02:00", Locale.GERMANY);
-
- assertDateFields(result);
- }
-
- @Test
- public void parseW3CDateTimeWithTrailingWhitespaceIsOk() {
- Date result = DateParser.parseW3CDateTime("2019-06-07T15:27:13+02:00 ", Locale.GERMANY);
-
- assertDateFields(result);
- }
-
- private void assertDateFields(Date result) {
- assertThat(result).isNotNull();
- assertThat(result).hasYear(2019);
- assertThat(result).hasMonth(6);
- assertThat(result).hasDayOfMonth(7);
- assertThat(result).hasHourOfDay(15);
- assertThat(result).hasMinute(27);
- assertThat(result).hasSecond(13);
- }
-
+ @Test
+ public void parseW3CDateTimeIsOk() throws Exception {
+ assertEquals(
+ new Date(1000),
+ DateParser.parseW3CDateTime("1970-01-01T00:00:01+00:00", Locale.GERMANY)
+ );
+ }
+
+ @Test
+ public void parseW3CDateTimeWithTrailingWhitespaceIsOk() throws Exception {
+ assertEquals(
+ new Date(1000),
+ DateParser.parseW3CDateTime("1970-01-01T00:00:01+00:00 ", Locale.GERMANY)
+ );
+ }
}
View it on GitLab: https://salsa.debian.org/java-team/rome/commit/395b594d2a3b01f5b0464a6b22e546565b6df761
--
View it on GitLab: https://salsa.debian.org/java-team/rome/commit/395b594d2a3b01f5b0464a6b22e546565b6df761
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200126/50ea6376/attachment.html>
More information about the pkg-java-commits
mailing list