Skip to content

Commit

Permalink
Release version 1.5.1
Browse files Browse the repository at this point in the history
 * Upgrade support to OpenCV 4.1.x
 * Upgrade to NetBeans 11.0 with support for recent versions of Java SE (issue bytedeco/procamcalib#16)
  • Loading branch information
saudet committed Jul 9, 2019
1 parent 4bc5720 commit 5bf06bc
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 100 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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 bytedeco/procamcalib#16](https://github.com/bytedeco/procamcalib/issues/16))

### April 11, 2019 version 1.5
* Adjust code to support latest changes in JavaCV

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ Source Code
I make all the source code available on GitHub at https://github.com/bytedeco/procamtracker . 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.)
Expand Down
130 changes: 34 additions & 96 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco</groupId>
<artifactId>procamtracker</artifactId>
<version>1.5</version>
<version>1.5.1</version>

<name>ProCamTracker</name>
<description>Markerless Interactive Augmented Reality with a Projector and a Color Camera</description>
Expand Down Expand Up @@ -75,152 +75,90 @@
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-bootstrap</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-core-startup</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-core</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-core-output2</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-swing-plaf</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-actions</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-explorer</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-filesystems</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-modules</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>RELEASE802</version>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-loaders</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-options-keymap</artifactId>
<version>RELEASE802</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>RELEASE110</version>
</dependency>
</dependencies>

<repositories>
<repository>
<id>netbeans</id>
<name>NetBeans</name>
<url>http://bits.netbeans.org/maven2/</url>
</repository>
</repositories>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>
Expand Down Expand Up @@ -258,7 +196,7 @@
</manifest>
<manifestEntries>
<!-- <addClasspath/> is broken: http://jira.codehaus.org/browse/MJAR-61 -->
<Class-Path>javacpp.jar javacv-platform.jar gluegen-rt.jar gluegen-rt-natives-linux-amd64.jar gluegen-rt-natives-macosx-universal.jar gluegen-rt-natives-windows-amd64.jar jocl.jar jocl-natives-linux-amd64.jar jocl-natives-macosx-universal.jar jocl-natives-windows-amd64.jar jogl-all.jar jogl-all-natives-linux-amd64.jar jogl-all-natives-macosx-universal.jar jogl-all-natives-windows-amd64.jar org-netbeans-bootstrap.jar org-netbeans-core-startup.jar org-netbeans-core.jar org-netbeans-core-output2.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-io.jar org-openide-modules.jar org-openide-nodes.jar org-openide-util.jar org-openide-util-lookup.jar org-openide-loaders.jar org-netbeans-modules-options-keymap.jar</Class-Path>
<Class-Path>javacpp.jar javacv-platform.jar gluegen-rt.jar gluegen-rt-natives-linux-amd64.jar gluegen-rt-natives-macosx-universal.jar gluegen-rt-natives-windows-amd64.jar jocl.jar jocl-natives-linux-amd64.jar jocl-natives-macosx-universal.jar jocl-natives-windows-amd64.jar jogl-all.jar jogl-all-natives-linux-amd64.jar jogl-all-natives-macosx-universal.jar jogl-all-natives-windows-amd64.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-output2.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-options-api.jar org-netbeans-modules-options-keymap.jar org-netbeans-modules-queries.jar org-netbeans-modules-sampler.jar org-netbeans-spi-quicksearch.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</Class-Path>
<Name>org/bytedeco/procamtracker/</Name>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Vendor>Samuel Audet</Implementation-Vendor>
Expand Down Expand Up @@ -331,21 +269,21 @@
<link>https://jogamp.org/deployment/v2.3.2/javadoc/gluegen/javadoc</link>
<link>https://jogamp.org/deployment/v2.3.2/javadoc/jocl/javadoc</link>
<link>https://jogamp.org/deployment/v2.3.2/javadoc/jogl/javadoc</link>
<link>http://bits.netbeans.org/dev/javadoc/org-netbeans-bootstrap</link>
<link>http://bits.netbeans.org/dev/javadoc/org-netbeans-core-startup</link>
<link>http://bits.netbeans.org/dev/javadoc/org-netbeans-core</link>
<link>http://bits.netbeans.org/dev/javadoc/org-netbeans-swing-plaf</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-actions</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-awt</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-dialogs</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-explorer</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-filesystems</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-io</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-modules</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-nodes</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-util</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-util-lookup</link>
<link>http://bits.netbeans.org/8.0.2/javadoc/org-openide-loaders</link>
<link>https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-bootstrap/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-core-startup/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.modules/org-netbeans-core/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-netbeans-swing-plaf/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-actions/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-awt/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-dialogs/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-explorer/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-filesystems/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-io/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-modules/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-nodes/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-util/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-util-lookup/RELEASE110</link>
<link>https://www.javadoc.io/doc/org.netbeans.api/org-openide-loaders/RELEASE110</link>
</links>
</configuration>
</execution>
Expand Down

0 comments on commit 5bf06bc

Please sign in to comment.