You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/10/07 03:24:41 UTC
svn commit: r1629791 - in /sis/branches/JDK7: ./
core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/
core/sis-referencing/src/main/java/org/apache/sis/referencing/
ide-project/NetBeans/nbproject/ storage/sis-netcdf/
Author: desruisseaux
Date: Tue Oct 7 01:24:41 2014
New Revision: 1629791
URL: http://svn.apache.org/r1629791
Log:
Merge from JDK8 branch.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
sis/branches/JDK7/pom.xml
sis/branches/JDK7/storage/sis-netcdf/pom.xml
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1629470-1629790
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java?rev=1629791&r1=1629790&r2=1629791&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] Tue Oct 7 01:24:41 2014
@@ -35,7 +35,7 @@ import static org.apache.sis.internal.me
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.4 (derived from geotk-3.00)
- * @version 0.4
+ * @version 0.5
* @module
*/
@XmlType(name = "CodeType")
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1629791&r1=1629790&r2=1629791&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java [UTF-8] Tue Oct 7 01:24:41 2014
@@ -254,7 +254,7 @@ public final class IdentifiedObjects ext
*/
public static Identifier getIdentifier(final IdentifiedObject object, final Citation authority) {
if (object != null) {
- final Iterator<Identifier> it = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> it = iterator(object.getIdentifiers());
if (it != null) while (it.hasNext()) {
final Identifier identifier = it.next();
if (identifier != null) { // Paranoiac check.
@@ -290,7 +290,7 @@ public final class IdentifiedObjects ext
*/
public static String getIdentifierOrName(final IdentifiedObject object) {
if (object != null) {
- final Iterator<Identifier> it = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> it = iterator(object.getIdentifiers());
if (it != null) while (it.hasNext()) {
final String code = toString(it.next());
if (code != null) { // Paranoiac check.
@@ -338,7 +338,7 @@ public final class IdentifiedObjects ext
}
}
}
- final Iterator<Identifier> id = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> id = iterator(object.getIdentifiers());
if (id != null) while (id.hasNext()) {
identifier = id.next();
if (identifier != null) { // Paranoiac check.
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1629791&r1=1629790&r2=1629791&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue Oct 7 01:24:41 2014
@@ -87,10 +87,10 @@ jdom1.version = 1.0
jdom2.version = 2.0.4
jee.version = 6.0
osgi.version = 5.0.0
-netcdf.version = 4.3.21
+netcdf.version = 4.5.3
joda-time.version = 2.2
-httpclient.version = 3.1
-slf4j.version = 1.6.4
+httpclient.version = 4.2.6
+slf4j.version = 1.7.5
junit.version = 4.11
hamcrest.version = 1.3
@@ -109,7 +109,7 @@ javac.classpath=\
${maven.repository}/rome/rome/${rome.version}/rome-${rome.version}.jar:\
${maven.repository}/jdom/jdom/${jdom1.version}/jdom-${jdom1.version}.jar:\
${maven.repository}/javax/javaee-api/${jee.version}/javaee-api-${jee.version}.jar:\
- ${maven.repository}/edu/ucar/netcdf/${netcdf.version}/netcdf-${netcdf.version}.jar:\
+ ${maven.repository}/edu/ucar/cdm/${netcdf.version}/cdm-${netcdf.version}.jar:\
${maven.repository}/org/osgi/org.osgi.core/${osgi.version}/org.osgi.core-${osgi.version}.jar
javac.processorpath=\
${javac.classpath}
@@ -130,6 +130,7 @@ run.test.classpath=\
${build.test.classes.dir}:\
${maven.repository}/org/jdom/jdom2/${jdom2.version}/jdom2-${jdom2.version}.jar:\
${maven.repository}/edu/ucar/udunits/${netcdf.version}/udunits-${netcdf.version}.jar:\
+ ${maven.repository}/edu/ucar/httpservices/${netcdf.version}/httpservices-${netcdf.version}.jar:\
${maven.repository}/joda-time/joda-time/${joda-time.version}/joda-time-${joda-time.version}.jar:\
${maven.repository}/commons-httpclient/commons-httpclient/${httpclient.version}/commons-httpclient-${httpclient.version}.jar:\
${maven.repository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar:\
Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1629791&r1=1629790&r2=1629791&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Tue Oct 7 01:24:41 2014
@@ -369,7 +369,7 @@ Apache SIS is a free software, Java lang
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
- <artifactId>netcdf</artifactId>
+ <artifactId>cdm</artifactId>
<version>${netcdf.version}</version>
<scope>provided</scope>
</dependency>
@@ -402,7 +402,7 @@ Apache SIS is a free software, Java lang
The last properties in this list depend on the Apache SIS branch.
=================================================================== -->
<properties>
- <netcdf.version>4.3.21</netcdf.version>
+ <netcdf.version>4.5.3</netcdf.version>
<findbugs.version>2.5.3</findbugs.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<website.encoding>UTF-8</website.encoding>
Modified: sis/branches/JDK7/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/pom.xml?rev=1629791&r1=1629790&r2=1629791&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/pom.xml Tue Oct 7 01:24:41 2014
@@ -114,7 +114,7 @@ Bridge between NetCDF Climate and Foreca
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
- <artifactId>netcdf</artifactId>
+ <artifactId>cdm</artifactId>
<optional>true</optional>
</dependency>