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 2639c21ad3c4226368be567e3dd0a2ec213e442c
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Feb 26 15:37:38 2023 +0100
Modify NetBeans project configuration for using the GeoAPI JAR file
built by the Maven project instead than the GeoAPI NetBeans project.
This is in anticipation for the removal of NetBeans Ant projects.
---
ide-project/NetBeans/README.txt | 31 -----------------------
ide-project/NetBeans/nbproject/project.properties | 12 +++------
2 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/ide-project/NetBeans/README.txt b/ide-project/NetBeans/README.txt
index a61c0c9f0d..6724fc51ca 100644
--- a/ide-project/NetBeans/README.txt
+++ b/ide-project/NetBeans/README.txt
@@ -3,37 +3,6 @@ This configuration is provided as a convenience for NetBeans
users - this is
not a replacement for the Maven build.
-==============================================================================
-Installation
-==============================================================================
-The configuration provided in this directory requires a checkout of GeoAPI
-source code. The recommended installation steps is as below (from the root
-directory of all SIS-related projects):
-
- mkdir SIS
- git clone -b geoapi-4.0 https://gitbox.apache.org/repos/asf/sis.git SIS/dev
- mkdir GeoAPI
- git clone http://github.com/opengeospatial/geoapi GeoAPI/master
-
-Above commands should create the following directory structure:
-
- +-- GeoAPI
- | +-- master
- | +-- README.md
- | +-- etc...
- +-- SIS
- +-- dev
- +-- README
- +-- etc...
-
-If a different directory layout is desired, this is possible provided that
-the following line is added to "nbproject/private/private.properties" file:
-
- project.GeoAPI = <path to your GeoAPI checkout>/ide-project/NetBeans
-
-
-
-
==============================================================================
Recommendations for NetBeans project configuration changes
==============================================================================
diff --git a/ide-project/NetBeans/nbproject/project.properties
b/ide-project/NetBeans/nbproject/project.properties
index d68acf9ea8..3a6929a3c4 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -86,18 +86,12 @@ test.fra-profile.dir =
${project.root}/profiles/sis-french-profile/src/test/java
src.jpn-profile.dir = ${project.root}/profiles/sis-japan-profile/src/main/java
test.jpn-profile.dir = ${project.root}/profiles/sis-japan-profile/src/test/java
-#
-# Dependencies on other NetBeans projects. The path is relative to the
"NetBeans" parent directory.
-# If a different path is desired, copy that line in the
"private/private.properties" file and edit
-# its value there.
-#
-project.GeoAPI = ../../../../GeoAPI/master/ide-project/NetBeans
-
#
# Version numbers for all dependencies.
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
+geoapi.version = 4.0-SNAPSHOT
jsr385.version = 2.1.3
jaxb.version = 2.3.3
jaxb.runtime = 2.3.7
@@ -130,7 +124,7 @@ postgresql.version = 42.5.1
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
- ${project.GeoAPI}/dist/geoapi.jar:\
+
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
${maven.repository}/javax/measure/unit-api/${jsr385.version}/unit-api-${jsr385.version}.jar:\
${maven.repository}/jakarta/xml/bind/jakarta.xml.bind-api/${jaxb.version}/jakarta.xml.bind-api-${jaxb.version}.jar:\
${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
@@ -152,7 +146,7 @@ javac.test.classpath=\
${maven.repository}/net/sf/geographiclib/GeographicLib-Java/${geographlib.version}/GeographicLib-Java-${geographlib.version}.jar:\
${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
- ${project.GeoAPI}/dist/geoapi-tests.jar:\
+
${maven.repository}/org/opengis/geoapi-conformance/${geoapi.version}/geoapi-conformance-${geoapi.version}.jar:\
${build.classes.dir}
javac.test.processorpath=\
${javac.test.classpath}
