sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/35: Tuning: netbeans project configuration, serialVersionUID of objects that are different between branches.
Date Wed, 20 Jun 2018 13:47:57 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 4b40f6472210cbb51d80be5d9b324f613ae54a9f
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Jun 20 15:28:57 2018 +0200

    Tuning: netbeans project configuration, serialVersionUID of objects that are different
between branches.
---
 .../java/org/apache/sis/metadata/iso/citation/DefaultAddress.java    | 4 ++--
 .../java/org/apache/sis/metadata/iso/citation/DefaultContact.java    | 2 +-
 .../org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java  | 2 +-
 ide-project/NetBeans/nbproject/genfiles.properties                   | 2 +-
 ide-project/NetBeans/nbproject/project.properties                    | 5 +++++
 ide-project/NetBeans/nbproject/project.xml                           | 1 +
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
index efddcb6..14cf7dd 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
@@ -58,7 +58,7 @@ public class DefaultAddress extends ISOMetadata implements Address {
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 1357443146723845129L;
+    private static final long serialVersionUID = -1709738216789373888L;
 
     /**
      * State, province of the location.
@@ -70,7 +70,7 @@ public class DefaultAddress extends ISOMetadata implements Address {
      */
     private InternationalString city;
 
-   /**
+    /**
      * Country of the physical address.
      */
     private InternationalString country;
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
index cfa5556..64764c7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
@@ -77,7 +77,7 @@ public class DefaultContact extends ISOMetadata implements Contact {
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -969735574940462381L;
+    private static final long serialVersionUID = 2972124992825717056L;
 
     /**
      * Telephone numbers at which the organization or individual may be contacted.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
index c1249ce..457cd6f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
@@ -69,7 +69,7 @@ public class DefaultOnlineResource extends ISOMetadata implements OnlineResource
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 1413613911128890864L;
+    private static final long serialVersionUID = 2627991335953178610L;
 
     /**
      * Location (address) for on-line access using a Uniform Resource Locator address or
diff --git a/ide-project/NetBeans/nbproject/genfiles.properties b/ide-project/NetBeans/nbproject/genfiles.properties
index 1f696fd..ec32b8a 100644
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=06dcebcb
+nbproject/build-impl.xml.data.CRC32=40d83d59
 nbproject/build-impl.xml.script.CRC32=b7ab89c5
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index b2cd5fe..e3f775c 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -140,6 +140,7 @@ javac.classpath=\
     ${maven.repository}/javax/javaee-api/${jee.version}/javaee-api-${jee.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:\
+    ${maven.repository}/org/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar:\
     ${maven.repository}/com/googlecode/jaxb-namespaceprefixmapper-interfaces/JAXBNamespacePrefixMapper/${jaxb-ns-mapper}/JAXBNamespacePrefixMapper-${jaxb-ns-mapper}.jar
 javac.processorpath=\
     ${javac.classpath}
@@ -158,6 +159,7 @@ javac.test.processorpath=\
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
+    ${maven.repository}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar:\
     ${maven.repository}/org/webjars/material-design-icons/${icons.version}/material-design-icons-${icons.version}.jar
 run.test.classpath=\
     ${javac.test.classpath}:\
@@ -198,6 +200,7 @@ debug.test.modulepath=\
 javac.compilerargs                       = -Xdoclint:syntax,html,reference,missing/protected,accessibility/protected
 javac.deprecation                        = true
 javac.external.vm                        = false
+javadoc.html5                            = true
 javadoc.windowtitle                      = Apache SIS
 javadoc.encoding                         = ${source.encoding}
 javadoc.author                           = true
@@ -214,6 +217,8 @@ annotation.processing.enabled.in.editor  = false
 annotation.processing.processors.list    =
 annotation.processing.run.all.processors = true
 annotation.processing.source.output      = ${build.generated.sources.dir}/ap-source-output
+jlink.launcher                           = false
+jlink.launcher.name                      = Apache_SIS
 jnlp.enabled                             = false
 jnlp.codebase.type                       = no.codebase
 jnlp.descriptor                          = application
diff --git a/ide-project/NetBeans/nbproject/project.xml b/ide-project/NetBeans/nbproject/project.xml
index 592860d..507a692 100644
--- a/ide-project/NetBeans/nbproject/project.xml
+++ b/ide-project/NetBeans/nbproject/project.xml
@@ -108,6 +108,7 @@
             <word>parsable</word>
             <word>polyline</word>
             <word>polylines</word>
+            <word>recursivity</word>
             <word>spliterator</word>
             <word>timezone</word>
             <word>Unicode</word>


Mime
View raw message