Merge branch 'master' into ANY23-393
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/68bf3872 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/68bf3872 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/68bf3872 Branch: refs/heads/master Commit: 68bf38722866aecfe6601046054ad226a83b864c Parents: 537c6e4 d570aba Author: Lewis John McGibbney <[email protected]> Authored: Wed Aug 29 11:22:52 2018 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Aug 29 11:22:52 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/any23/vocab/ICAL.java | 14 + core/pom.xml | 5 + .../calendar/BaseCalendarExtractor.java | 540 +++++++++++++++++++ .../any23/extractor/calendar/ICalExtractor.java | 41 ++ .../calendar/ICalExtractorFactory.java | 47 ++ .../any23/extractor/calendar/JCalExtractor.java | 40 ++ .../calendar/JCalExtractorFactory.java | 48 ++ .../any23/extractor/calendar/XCalExtractor.java | 41 ++ .../calendar/XCalExtractorFactory.java | 47 ++ .../any23/extractor/calendar/package-info.java | 21 + .../calendar/BaseCalendarExtractorTest.java | 98 ++++ .../extractor/calendar/ICalExtractorTest.java | 77 +++ .../extractor/calendar/JCalExtractorTest.java | 46 ++ .../extractor/calendar/XCalExtractorTest.java | 46 ++ .../apache/any23/vocab/RDFSchemaUtilsTest.java | 4 +- pom.xml | 5 + .../rfc7265-example1-expected.nquads | 26 + .../calendar.json/rfc7265-example1.json | 18 + .../rfc7265-example2-expected.nquads | 69 +++ .../calendar.json/rfc7265-example2.json | 96 ++++ .../example2-bad-timezone-expected.nquads | 56 ++ .../calendar.text/example2-bad-timezone.ics | 34 ++ .../example2-external-timezone-expected.nquads | 56 ++ .../example2-external-timezone.ics | 34 ++ .../rfc5545-example1-expected.nquads | 31 ++ .../calendar.text/rfc5545-example1.ics | 17 + .../rfc5545-example2-expected.nquads | 56 ++ .../calendar.text/rfc5545-example2.ics | 34 ++ .../rfc5545-example3-expected.nquads | 41 ++ .../calendar.text/rfc5545-example3.ics | 22 + .../rfc5545-example4-expected.nquads | 41 ++ .../calendar.text/rfc5545-example4.ics | 22 + .../rfc5545-example5-expected.nquads | 31 ++ .../calendar.text/rfc5545-example5.ics | 23 + .../rfc5545-example6-expected.nquads | 29 + .../calendar.text/rfc5545-example6.ics | 13 + .../rfc6321-example1-expected.nquads | 26 + .../resources/calendar.xml/rfc6321-example1.xml | 34 ++ .../rfc6321-example2-expected.nquads | 69 +++ .../resources/calendar.xml/rfc6321-example2.xml | 149 +++++ 40 files changed, 2145 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/68bf3872/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/68bf3872/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 8cdaf07,2aa6278..26a23ec --- a/pom.xml +++ b/pom.xml @@@ -373,10 -373,10 +373,15 @@@ <version>1.11.3</version> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.4.0-b180725.0427</version> + </dependency> ++ <dependency> + <groupId>net.sf.biweekly</groupId> + <artifactId>biweekly</artifactId> + <version>0.6.2</version> + </dependency> <!-- BEGIN: Tika --> <dependency>
