You are viewing a plain text version of this content. The canonical link for it is here.
Posted to odf-commits@incubator.apache.org by sv...@apache.org on 2017/04/11 11:48:07 UTC
svn commit: r1790960 - in /incubator/odf/trunk: ./ generator/
generator/schema2template-maven-plugin/ odfdom/
odfdom/src/main/java/org/odftoolkit/odfdom/dom/
odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/
odfdom/src/main/java/org/odftoolkit/odfdo...
Author: svanteschubert
Date: Tue Apr 11 11:48:06 2017
New Revision: 1790960
URL: http://svn.apache.org/viewvc?rev=1790960&view=rev
Log:
#ODFTOOLKIT-448# #ODFTOOLKIT-415# Update Java baseline to JDK 8, upgrading to latest Jena 3.2.0 and latest Maven Plugins
Modified:
incubator/odf/trunk/generator/pom.xml
incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml
incubator/odf/trunk/odfdom/pom.xml
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/OdfSchemaDocument.java
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/BookmarkRDFMetadataExtractor.java
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileDom.java
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackageDocument.java
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/JenaSink.java
incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/URIExtractorImpl.java
incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java
incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/RDFMetadataTest.java
incubator/odf/trunk/pom.xml
incubator/odf/trunk/simple/pom.xml
incubator/odf/trunk/taglets/pom.xml
incubator/odf/trunk/validator/pom.xml
incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java
incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/ValidTest.java
incubator/odf/trunk/xslt-runner/pom.xml
Modified: incubator/odf/trunk/generator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/generator/pom.xml (original)
+++ incubator/odf/trunk/generator/pom.xml Tue Apr 11 11:48:06 2017
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
+ <version>2.5.3</version>
<configuration>
<!-- Workaround for http://jira.codehaus.org/browse/MGPG-9 -->
<mavenExecutorId>forked-path</mavenExecutorId>
@@ -47,7 +47,7 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>Schema2template</doctitle>
<minmemory>512m</minmemory>
Modified: incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml (original)
+++ incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml Tue Apr 11 11:48:06 2017
@@ -41,19 +41,19 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
- <version>2.0.7</version>
+ <version>3.3.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<scope>provided</scope>
- <version>2.0.7</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
- <version>2.0.7</version>
+ <version>3.3.9</version>
</dependency>
</dependencies>
@@ -75,7 +75,7 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.6</version>
+ <version>3.5</version>
<configuration>
<goalPrefix>schema2template</goalPrefix>
</configuration>
Modified: incubator/odf/trunk/odfdom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/pom.xml (original)
+++ incubator/odf/trunk/odfdom/pom.xml Tue Apr 11 11:48:06 2017
@@ -54,12 +54,10 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.11.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -83,13 +81,13 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-7</version>
+ <version>2.12</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -102,7 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<index>true</index>
@@ -129,7 +127,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<!-- Workaround for http://jira.codehaus.org/browse/MGPG-9 -->
<mavenExecutorId>forked-path</mavenExecutorId>
@@ -139,7 +137,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Explizit version required for fix on systemPropertyVariables -->
- <version>2.15</version>
+ <version>2.19.1</version>
<configuration>
<forkMode>pertest</forkMode>
<argLine>-Xms512m -Xmx512m</argLine>
@@ -153,7 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>ODFDOM</doctitle>
<minmemory>1024m</minmemory>
@@ -195,7 +193,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -243,7 +241,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>ODFDOM</doctitle>
<minmemory>512m</minmemory>
@@ -260,7 +258,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
<configuration>
<instrumentation>
<excludes>
@@ -273,7 +271,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.19.1</version>
<reportSets>
<reportSet>
<id>integration-tests</id>
@@ -328,7 +326,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
+ <version>1.0</version>
<executions>
<execution>
<id>download-odf-schema-v1.2</id>
@@ -478,7 +476,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Explizit version required for fix on systemPropertyVariables -->
- <version>2.6</version>
+ <version>2.19.1</version>
<configuration>
<systemPropertyVariables>
<odfdom.version>${project.version}</odfdom.version>
@@ -510,7 +508,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/OdfSchemaDocument.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/OdfSchemaDocument.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/OdfSchemaDocument.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/OdfSchemaDocument.java Tue Apr 11 11:48:06 2017
@@ -49,9 +49,9 @@ import org.w3c.dom.NodeList;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.ResourceUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.util.ResourceUtils;
import java.io.InputStreamReader;
/**
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/BookmarkRDFMetadataExtractor.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/BookmarkRDFMetadataExtractor.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/BookmarkRDFMetadataExtractor.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/rdfa/BookmarkRDFMetadataExtractor.java Tue Apr 11 11:48:06 2017
@@ -1,37 +1,39 @@
/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
- *
+ *
* Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Use is subject to license terms.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0. You can also
* obtain a copy of the License at http://odftoolkit.org/docs/license.txt
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*
************************************************************************/
package org.odftoolkit.odfdom.dom.rdfa;
+import org.apache.jena.rdf.model.Resource;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
-
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
import org.odftoolkit.odfdom.dom.DefaultElementVisitor;
import org.odftoolkit.odfdom.dom.OdfDocumentNamespace;
import org.odftoolkit.odfdom.dom.element.text.TextBookmarkEndElement;
@@ -43,11 +45,6 @@ import org.odftoolkit.odfdom.pkg.rdfa.Je
import org.w3c.dom.Node;
import org.xml.sax.Attributes;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-
/**
* This is a sub class of <code>DefaultElementVisitor</code>, which is used to
* extract metadata from {@odf.element text:bookmark-start} to
@@ -69,7 +66,7 @@ public class BookmarkRDFMetadataExtracto
/**
* This class is used to provide the string builder functions to extractor.
* It will automatically process the last NewLineChar.
- *
+ *
* @since 0.3.5
*/
protected static class ExtractorStringBuilder {
@@ -83,7 +80,7 @@ public class BookmarkRDFMetadataExtracto
/**
* Append a string
- *
+ *
* @param str
* - the string
*/
@@ -93,7 +90,7 @@ public class BookmarkRDFMetadataExtracto
/**
* Append a character
- *
+ *
* @param ch
* - the character
*/
@@ -127,7 +124,7 @@ public class BookmarkRDFMetadataExtracto
* Create a BookmarkRDFMetadataExtractor instance, which RDF metadata
* content of bookmarks can be extracted by
* <code>getBookmarkRDFMetadata()</code>.
- *
+ *
* @param element
* the ODF element whose text will be extracted.
* @return an instance of BookmarkRDFMetadataExtractor
@@ -138,7 +135,7 @@ public class BookmarkRDFMetadataExtracto
/**
* Return the RDF metadata of specified ODF element as a Jena Model.
- *
+ *
* @return the text content as a string
*/
public Model getBookmarkRDFMetadata(OdfFileDom dom) {
@@ -213,7 +210,7 @@ public class BookmarkRDFMetadataExtracto
/**
* Constructor with an ODF element as parameter
- *
+ *
* @param element
* the ODF element whose text would be extracted.
*/
@@ -225,7 +222,7 @@ public class BookmarkRDFMetadataExtracto
/**
* The end users needn't to care of this method, if you don't want to
* override the text content handling strategy of <code>OdfElement</code>.
- *
+ *
* @see org.odftoolkit.odfdom.dom.DefaultElementVisitor#visit(org.odftoolkit.odfdom.pkg.OdfElement)
*/
@Override
@@ -256,7 +253,7 @@ public class BookmarkRDFMetadataExtracto
/**
* Append the text content of this element to string buffer.
- *
+ *
* @param ele
* the ODF element whose text will be appended.
*/
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileDom.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileDom.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileDom.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileDom.java Tue Apr 11 11:48:06 2017
@@ -58,7 +58,7 @@ import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
/**
* The DOM representation of an XML file within the ODF document.
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackageDocument.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackageDocument.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackageDocument.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackageDocument.java Tue Apr 11 11:48:06 2017
@@ -23,9 +23,9 @@
*/
package org.odftoolkit.odfdom.pkg;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.ResourceUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.util.ResourceUtils;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/JenaSink.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/JenaSink.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/JenaSink.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/JenaSink.java Tue Apr 11 11:48:06 2017
@@ -31,12 +31,12 @@ import org.odftoolkit.odfdom.pkg.OdfFile
import org.odftoolkit.odfdom.pkg.OdfFileSaxHandler;
import org.w3c.dom.Node;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.shared.PrefixMapping.IllegalPrefixException;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.shared.PrefixMapping.IllegalPrefixException;
/**
* To cache the Jena RDF triples parsed from RDFaParser
Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/URIExtractorImpl.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/URIExtractorImpl.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/URIExtractorImpl.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/URIExtractorImpl.java Tue Apr 11 11:48:06 2017
@@ -1,20 +1,20 @@
/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
- *
+ *
* Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Use is subject to license terms.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0. You can also
* obtain a copy of the License at http://odftoolkit.org/docs/license.txt
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*
@@ -27,15 +27,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import javax.xml.namespace.QName;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
-
import net.rootdev.javardfa.Constants;
import net.rootdev.javardfa.Resolver;
import net.rootdev.javardfa.Setting;
-
import org.apache.commons.validator.routines.UrlValidator;
/**
@@ -79,12 +76,12 @@ class URIExtractorImpl implements URIExt
private boolean isValidURI(String uri){
return this.urlValidator.isValid(uri);
}
-
+
public List<String> getURIs(StartElement element, Attribute attr,
EvalContext context) {
-
- List<String> uris = new LinkedList<String>();
-
+
+ List<String> uris = new LinkedList<String>();
+
String[] curies = attr.getValue().split("\\s+");
boolean permitReserved = Util
.qNameEquals(Constants.rel, attr.getName())
@@ -106,7 +103,7 @@ class URIExtractorImpl implements URIExt
public String expandCURIE(StartElement element, String value,
EvalContext context) {
-
+
if (value.startsWith("_:")) {
if (!settings.contains(Setting.ManualNamespaces))
return value;
@@ -122,7 +119,7 @@ class URIExtractorImpl implements URIExt
return null;
}
String prefix = value.substring(0, offset - 1);
-
+
// Apparently these are not allowed to expand
if ("xml".equals(prefix) || "xmlns".equals(prefix))
@@ -182,7 +179,7 @@ class URIExtractorImpl implements URIExt
return null;
}
}
-
+
public void setNamespaceURI(String prefix, String namespaceURI){
if (xmlnsMap == Collections.EMPTY_MAP)
xmlnsMap = new HashMap<String, String>();
@@ -193,7 +190,7 @@ class URIExtractorImpl implements URIExt
/*
* (c) Copyright 2009 University of Bristol All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright notice,
@@ -203,7 +200,7 @@ class URIExtractorImpl implements URIExt
* materials provided with the distribution. 3. The name of the author may not
* be used to endorse or promote products derived from this software without
* specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
Modified: incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java (original)
+++ incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java Tue Apr 11 11:48:06 2017
@@ -40,8 +40,8 @@ import org.odftoolkit.odfdom.doc.OdfText
import org.odftoolkit.odfdom.utils.ResourceUtilities;
import org.xml.sax.InputSource;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.test.ModelTestBase;
import java.util.logging.Level;
import org.junit.Assert;
Modified: incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/RDFMetadataTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/RDFMetadataTest.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/RDFMetadataTest.java (original)
+++ incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/RDFMetadataTest.java Tue Apr 11 11:48:06 2017
@@ -42,12 +42,12 @@ import org.odftoolkit.odfdom.dom.rdfa.Bo
import org.odftoolkit.odfdom.utils.ResourceUtilities;
import org.w3c.dom.Node;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-import com.hp.hpl.jena.util.PrintUtil;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.rdf.model.test.ModelTestBase;
+import org.apache.jena.util.PrintUtil;
public class RDFMetadataTest extends ModelTestBase {
Modified: incubator/odf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/pom.xml (original)
+++ incubator/odf/trunk/pom.xml Tue Apr 11 11:48:06 2017
@@ -33,7 +33,7 @@
</parent>
<properties>
- <jdk.version>1.6</jdk.version>
+ <jdk.version>1.8</jdk.version>
</properties>
<dependencyManagement>
@@ -41,33 +41,33 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <version>1.4.01</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.12</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.11.2</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<classifier>tests</classifier>
- <version>2.11.2</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>net.rootdev</groupId>
@@ -77,12 +77,12 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.5.0</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>net.java.dev.msv</groupId>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.2</version>
+ <version>1.10.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: incubator/odf/trunk/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/simple/pom.xml (original)
+++ incubator/odf/trunk/simple/pom.xml Tue Apr 11 11:48:06 2017
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<index>true</index>
@@ -102,7 +102,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<!-- Workaround for http://jira.codehaus.org/browse/MGPG-9 -->
<mavenExecutorId>forked-path</mavenExecutorId>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>Simple Java API for ODF(Simple ODF)</doctitle>
<minmemory>512m</minmemory>
@@ -140,7 +140,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.19.1</version>
<configuration>
<systemPropertyVariables>
<simple.version>${project.version}</simple.version>
@@ -150,7 +150,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -212,12 +212,12 @@
<extension>
<groupId>org.jvnet.wagon-svn</groupId>
<artifactId>wagon-svn</artifactId>
- <version>1.9</version>
+ <version>1.12</version>
</extension>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-7</version>
+ <version>2.12</version>
</extension>
</extensions>
</build>
@@ -226,7 +226,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>Simple Java API for ODF(Simple ODF)</doctitle>
<minmemory>512m</minmemory>
@@ -243,7 +243,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
<configuration>
<instrumentation>
<excludes>
@@ -256,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.19.1</version>
<reportSets>
<reportSet>
<id>integration-tests</id>
Modified: incubator/odf/trunk/taglets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/taglets/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/taglets/pom.xml (original)
+++ incubator/odf/trunk/taglets/pom.xml Tue Apr 11 11:48:06 2017
@@ -40,7 +40,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -49,7 +49,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<attach>true</attach>
@@ -68,7 +68,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -135,7 +135,7 @@
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
- <version>1.7.0</version>
+ <version>1.7.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
@@ -172,7 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Modified: incubator/odf/trunk/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/validator/pom.xml (original)
+++ incubator/odf/trunk/validator/pom.xml Tue Apr 11 11:48:06 2017
@@ -43,7 +43,6 @@
<dependency>
<groupId>net.java.dev.msv</groupId>
<artifactId>msv-core</artifactId>
- <version>2013.6.1</version>
</dependency>
<dependency>
<groupId>org.iso_relax.verifier.jaxp.validation</groupId>
@@ -95,7 +94,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-7</version>
+ <version>2.12</version>
</extension>
</extensions>
<plugins><!--
@@ -266,7 +265,7 @@
</plugin>-->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -279,7 +278,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<index>true</index>
@@ -315,7 +314,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<!-- Workaround for http://jira.codehaus.org/browse/MGPG-9 -->
<mavenExecutorId>forked-path</mavenExecutorId>
@@ -336,7 +335,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -387,7 +386,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
<configuration>
<instrumentation>
<excludes>
@@ -399,7 +398,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>ODFDOM</doctitle>
<minmemory>512m</minmemory>
@@ -416,7 +415,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.19.1</version>
<reportSets>
<reportSet>
<id>integration-tests</id>
@@ -492,7 +491,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Explizit version required for fix on systemPropertyVariables -->
- <version>2.6</version>
+ <version>2.19.1</version>
<configuration>
<systemPropertyVariables>
<odfdom.version>${project.version}</odfdom.version>
@@ -525,7 +524,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Modified: incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java (original)
+++ incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java Tue Apr 11 11:48:06 2017
@@ -23,7 +23,7 @@ package org.odftoolkit.odfvalidator;
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
/** Test some invalid packages.
Modified: incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/ValidTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/ValidTest.java?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/ValidTest.java (original)
+++ incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/ValidTest.java Tue Apr 11 11:48:06 2017
@@ -22,7 +22,7 @@
package org.odftoolkit.odfvalidator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -35,7 +35,7 @@ public class ValidTest extends OdfValida
String output = "";
try {
String name = "empty.odt";
- output = doValidation(name, OdfVersion.V1_0, OdfValidatorMode.VALIDATE_STRICT, true);
+ output = doValidation(name, OdfVersion.V1_0, OdfValidatorMode.VALIDATE_STRICT, true);
} catch (Throwable t) {
t.printStackTrace();
Assert.fail(t.toString());
@@ -46,7 +46,7 @@ public class ValidTest extends OdfValida
}
Assert.assertTrue(output.contains("<span "));
}
-
+
@Test
@Ignore
public void validate2() {
@@ -61,9 +61,9 @@ public class ValidTest extends OdfValida
if(output.contains("Exception")){
System.out.println("OUTPUT:" + output);
Assert.fail("An exception occured during validation!");
- }
+ }
Assert.assertTrue(output.contains("testValid1.odt:Info:no errors, no warnings"));
- }
+ }
@Test
@Ignore
@@ -71,9 +71,9 @@ public class ValidTest extends OdfValida
String output = "";
try {
String name = "empty.odt";
- output = doValidation(name, OdfVersion.V1_0, OdfValidatorMode.VALIDATE_STRICT);
+ output = doValidation(name, OdfVersion.V1_0, OdfValidatorMode.VALIDATE_STRICT);
output = doValidation(name, OdfVersion.V1_1, OdfValidatorMode.VALIDATE);
- output = doValidation(name, OdfVersion.V1_2, null);
+ output = doValidation(name, OdfVersion.V1_2, null);
} catch (Throwable t) {
t.printStackTrace();
Assert.fail(t.toString());
@@ -83,7 +83,7 @@ public class ValidTest extends OdfValida
Assert.fail("An exception occured during validation!");
}
//Assert.assertTrue(output.contains("dummy.odt:Info:no errors, no warnings"));
- }
+ }
@Test
public void validateForeignElementCharacterContentStrict() {
Modified: incubator/odf/trunk/xslt-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/xslt-runner/pom.xml?rev=1790960&r1=1790959&r2=1790960&view=diff
==============================================================================
--- incubator/odf/trunk/xslt-runner/pom.xml (original)
+++ incubator/odf/trunk/xslt-runner/pom.xml Tue Apr 11 11:48:06 2017
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -78,7 +78,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>