From 529051a21497475512d790aa513861cdadb1027b Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Tue, 9 Jul 2019 17:45:01 +0900 Subject: [PATCH] Release version 1.5.1 * Upgrade support to OpenCV 4.1.x * Upgrade to NetBeans 11.0 with support for recent versions of Java SE (issue #16) --- CHANGELOG.md | 4 +++ README.md | 8 ++--- pom.xml | 94 ++++++++++++++++------------------------------------ 3 files changed, 36 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e4c6a4..7b1e09d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ +### July 9, 2019 version 1.5.1 + * Upgrade support to OpenCV 4.1.x + * Upgrade to NetBeans 11.0 with support for recent versions of Java SE ([issue #16](https://github.com/bytedeco/procamcalib/issues/16)) + ### April 11, 2019 version 1.5 * Adjust code to support latest changes in JavaCV diff --git a/README.md b/README.md index 844ae6c..a2db450 100644 --- a/README.md +++ b/README.md @@ -72,12 +72,12 @@ Source Code I make all the source code available on GitHub at https://github.com/bytedeco/procamcalib . You will also need the following to modify and build the application: * A C/C++ compiler - * JavaCPP 1.5 https://github.com/bytedeco/javacpp - * JavaCV 1.5 https://github.com/bytedeco/javacv - * OpenCV 4.0.x http://sourceforge.net/projects/opencvlibrary/files/ + * JavaCPP 1.5.1 https://github.com/bytedeco/javacpp + * JavaCV 1.5.1 https://github.com/bytedeco/javacv + * OpenCV 4.1.x http://sourceforge.net/projects/opencvlibrary/files/ * FFmpeg 4.1.x http://ffmpeg.org/download.html * ARToolKitPlus 2.3.x https://launchpad.net/artoolkitplus - * NetBeans 8.0 http://netbeans.org/downloads/ + * NetBeans 11.0 https://netbeans.apache.org/download/ * Maven 3.x http://maven.apache.org/download.html (The icons were shamelessly copied from the source code repository of NetBeans. Also licensed under the GPLv2.) diff --git a/pom.xml b/pom.xml index 55589f9..ca855c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.bytedeco procamcalib - 1.5 + 1.5.1 ProCamCalib A User-Friendly Method to Calibrate Cameras and Projector-Camera Systems @@ -59,108 +59,70 @@ org.netbeans.modules org-netbeans-bootstrap - RELEASE802 + RELEASE110 org.netbeans.modules org-netbeans-core-startup - RELEASE802 + RELEASE110 org.netbeans.modules org-netbeans-core - RELEASE802 - - - * - * - - + RELEASE110 org.netbeans.api org-netbeans-swing-plaf - RELEASE802 + RELEASE110 org.netbeans.api org-openide-actions - RELEASE802 - - - * - * - - + RELEASE110 org.netbeans.api org-openide-awt - RELEASE802 - - - * - * - - + RELEASE110 org.netbeans.api org-openide-dialogs - RELEASE802 - - - * - * - - + RELEASE110 org.netbeans.api org-openide-explorer - RELEASE802 - - - * - * - - + RELEASE110 org.netbeans.api org-openide-filesystems - RELEASE802 + RELEASE110 org.netbeans.api org-openide-modules - RELEASE802 + RELEASE110 org.netbeans.api org-openide-nodes - RELEASE802 + RELEASE110 org.netbeans.api org-openide-util - RELEASE802 + RELEASE110 org.netbeans.api org-openide-util-lookup - RELEASE802 + RELEASE110 - - - netbeans - NetBeans - http://bits.netbeans.org/maven2/ - - - ${project.artifactId} @@ -198,7 +160,7 @@ - javacpp.jar javacv-platform.jar org-netbeans-bootstrap.jar org-netbeans-core-startup.jar org-netbeans-core.jar org-netbeans-swing-plaf.jar org-openide-actions.jar org-openide-awt.jar org-openide-dialogs.jar org-openide-explorer.jar org-openide-filesystems.jar org-openide-modules.jar org-openide-nodes.jar org-openide-util.jar org-openide-util-lookup.jar + javacpp.jar javacv-platform.jar org-netbeans-api-annotations-common.jar org-netbeans-api-intent.jar org-netbeans-api-io.jar org-netbeans-api-progress.jar org-netbeans-api-progress-nb.jar org-netbeans-api-scripting.jar org-netbeans-api-templates.jar org-netbeans-bootstrap.jar org-netbeans-core.jar org-netbeans-core-startup-base.jar org-netbeans-core-startup.jar org-netbeans-libs-asm.jar org-netbeans-modules-editor-mimelookup.jar org-netbeans-modules-keyring.jar org-netbeans-modules-queries.jar org-netbeans-modules-sampler.jar org-netbeans-swing-outline.jar org-netbeans-swing-plaf.jar org-netbeans-swing-tabcontrol.jar org-openide-actions.jar org-openide-awt.jar org-openide-dialogs.jar org-openide-explorer.jar org-openide-filesystems.jar org-openide-filesystems-nb.jar org-openide-io.jar org-openide-loaders.jar org-openide-modules.jar org-openide-nodes.jar org-openide-text.jar org-openide-util.jar org-openide-util-lookup.jar org-openide-util-ui.jar org-openide-windows.jar org/bytedeco/procamcalib/ ${project.name} Samuel Audet @@ -268,19 +230,19 @@ http://bytedeco.org/javacpp-presets/videoinput/apidocs http://bytedeco.org/javacpp-presets/artoolkitplus/apidocs http://bytedeco.org/javacv/apidocs - http://bits.netbeans.org/dev/javadoc/org-netbeans-bootstrap - http://bits.netbeans.org/dev/javadoc/org-netbeans-core-startup - http://bits.netbeans.org/dev/javadoc/org-netbeans-core - http://bits.netbeans.org/dev/javadoc/org-netbeans-swing-plaf - http://bits.netbeans.org/8.0.2/javadoc/org-openide-actions - http://bits.netbeans.org/8.0.2/javadoc/org-openide-awt - http://bits.netbeans.org/8.0.2/javadoc/org-openide-dialogs - http://bits.netbeans.org/8.0.2/javadoc/org-openide-explorer - http://bits.netbeans.org/8.0.2/javadoc/org-openide-filesystems - http://bits.netbeans.org/8.0.2/javadoc/org-openide-modules - http://bits.netbeans.org/8.0.2/javadoc/org-openide-nodes - http://bits.netbeans.org/8.0.2/javadoc/org-openide-util - http://bits.netbeans.org/8.0.2/javadoc/org-openide-util-lookup + https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-bootstrap/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-core-startup/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-core/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-netbeans-swing-plaf/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-actions/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-awt/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-dialogs/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-explorer/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-filesystems/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-modules/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-nodes/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-util/RELEASE110 + https://www.javadoc.io/doc/org.netbeans.api/org-openide-util-lookup/RELEASE110