[opencv] 129/251: Merge pull request #9190 from alalek:update_java_build

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 9313978f618dbe39ad737ccd8bffa23b52d59aaa
Merge: ce6b06e 2360291
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Thu Jul 20 15:32:47 2017 +0000

    Merge pull request #9190 from alalek:update_java_build

 modules/java/CMakeLists.txt                        | 63 +++++++++++++++-------
 .../src/org/opencv/test/OpenCVTestRunner.java      |  2 +-
 ...nCVLoader.java => android+OpenCVLoader.java.in} | 11 ++++
 modules/java/generator/src/java/android+sync.py    |  7 ---
 ...Loader.java => osgi+OpenCVNativeLoader.java.in} |  2 +-
 platforms/maven/opencv-it/pom.xml                  |  2 +-
 .../java/org/opencv/osgi/DeployOpenCVTest.java     |  6 +--
 platforms/maven/opencv/pom.xml                     | 25 +++------
 platforms/maven/opencv/scripts/execstack_check     |  6 ++-
 platforms/maven/pom.xml                            |  8 +--
 10 files changed, 78 insertions(+), 54 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git