[sikuli] 88/385: pom changes for the libs handling
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 19:25:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.
commit 373b43c353bcdb8f11696449cf02243ed257a118
Author: Raimund Hocke <rmhdevelop at me.com>
Date: Tue Dec 31 16:07:44 2013 +0100
pom changes for the libs handling
---
API/pom.xml | 5 ++
.../java/org/sikuli/script/natives/Vision.java | 19 --------
Basics/pom.xml | 5 --
.../java/org/sikuli/basics/proxies/Vision.java | 18 -------
IDE/ide-jar.xml | 53 ++++++++++++++-------
Libs/src/main/java/org/sikuli/libs/RunLibs.java | 13 -----
.../libs/mac/libs64/libopencv_core.2.4.dylib | Bin 2363520 -> 0 bytes
.../libs/mac/libs64/libopencv_highgui.2.4.dylib | Bin 1934400 -> 0 bytes
.../libs/mac/libs64/libopencv_imgproc.2.4.dylib | Bin 2259656 -> 0 bytes
Natives/pom.xml | 8 ----
plain.xml | 2 +-
11 files changed, 41 insertions(+), 82 deletions(-)
diff --git a/API/pom.xml b/API/pom.xml
index 872252c..df31743 100755
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -35,6 +35,11 @@
</dependency>
<dependency>
<groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Natives</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sikuli</groupId>
<artifactId>SikuliX-OpenCV</artifactId>
<version>2.4.7</version>
</dependency>
diff --git a/API/src/main/java/org/sikuli/script/natives/Vision.java b/API/src/main/java/org/sikuli/script/natives/Vision.java
deleted file mode 100644
index 568b944..0000000
--- a/API/src/main/java/org/sikuli/script/natives/Vision.java
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * DEPRECATED: for backward comatibility only
-*/
-package org.sikuli.script.natives;
-
-import org.sikuli.basics.Settings;
-
-public class Vision {
- @Deprecated
- public static void setParameter(String param, float val) {
- Settings.setVisionParameter(param, val);
- }
-
- @Deprecated
- public static float getParameter(String param) {
- return Settings.getVisionParameter(param);
- }
-}
diff --git a/Basics/pom.xml b/Basics/pom.xml
index 22436b8..e294778 100755
--- a/Basics/pom.xml
+++ b/Basics/pom.xml
@@ -22,11 +22,6 @@
<version>1.1.0</version>
<dependencies>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Natives</artifactId>
- <version>1.1.0</version>
- </dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/Basics/src/main/java/org/sikuli/basics/proxies/Vision.java b/Basics/src/main/java/org/sikuli/basics/proxies/Vision.java
deleted file mode 100644
index 66a241c..0000000
--- a/Basics/src/main/java/org/sikuli/basics/proxies/Vision.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * DEPRECATED: for backward comatibility only
-*/
-package org.sikuli.basics.proxies;
-
-import org.sikuli.basics.Settings;
-
-public class Vision {
- @Deprecated
- private static void setParameter(String param, float val) {
- Settings.setVisionParameter(param, val);
- }
-
- @Deprecated
- public static float getParameter(String param) {
- return Settings.getVisionParameter(param);
- }
-}
diff --git a/IDE/ide-jar.xml b/IDE/ide-jar.xml
index 4672539..6ffd42c 100644
--- a/IDE/ide-jar.xml
+++ b/IDE/ide-jar.xml
@@ -9,18 +9,18 @@
* RaiMan 2013
-->
- <parent>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
- <version>1.1.0</version>
- <relativePath>../</relativePath>
- </parent>
+ <parent>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX</artifactId>
+ <version>1.1.0</version>
+ <relativePath>../</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-IDE</artifactId>
- <version>1.1.0-Beta1</version>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-IDE</artifactId>
+ <version>1.1.0-Beta1</version>
<dependencies>
<dependency>
@@ -29,11 +29,6 @@
<version>1.1.0</version>
</dependency>
<dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Jython</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
@@ -77,10 +72,10 @@
<mainClass>org.sikuli.ide.SikuliIDE</mainClass>
</manifest>
</archive>
- <descriptors>
- <descriptor>../${sikuli.jartype}</descriptor>
- </descriptors>
- <finalName>${sikuli.jarname}-ide</finalName>
+ <descriptors>
+ <descriptor>../${sikuli.jartype}</descriptor>
+ </descriptors>
+ <finalName>${sikuli.jarname}-ide</finalName>
</configuration>
<executions>
<execution>
@@ -92,6 +87,28 @@
</execution>
</executions>
</plugin>
+ <!-- to suppress sources in any case -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase/>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- to suppress javadocs in any case -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase/>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/Libs/src/main/java/org/sikuli/libs/RunLibs.java b/Libs/src/main/java/org/sikuli/libs/RunLibs.java
deleted file mode 100644
index 2473312..0000000
--- a/Libs/src/main/java/org/sikuli/libs/RunLibs.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.sikuli.libs;
-
-/**
- *
- * @author rhocke
- */
-public class RunLibs {
-
-}
diff --git a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_core.2.4.dylib b/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_core.2.4.dylib
deleted file mode 100644
index 8dc0d9f..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_core.2.4.dylib and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_highgui.2.4.dylib b/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_highgui.2.4.dylib
deleted file mode 100644
index 6ecb21a..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_highgui.2.4.dylib and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_imgproc.2.4.dylib b/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_imgproc.2.4.dylib
deleted file mode 100644
index d4d5cf6..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/mac/libs64/libopencv_imgproc.2.4.dylib and /dev/null differ
diff --git a/Natives/pom.xml b/Natives/pom.xml
index 2ae4cde..335e78c 100644
--- a/Natives/pom.xml
+++ b/Natives/pom.xml
@@ -22,14 +22,6 @@
<artifactId>SikuliX-Natives</artifactId>
<version>1.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Libs</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
-
<build>
<defaultGoal>clean install</defaultGoal>
</build>
diff --git a/plain.xml b/plain.xml
index b40dc2f..a886280 100644
--- a/plain.xml
+++ b/plain.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<!-- TODO: a jarjar format would be better -->
- <id>complete</id>
+ <id>plain</id>
<formats>
<format>jar</format>
</formats>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list