[sikuli] 230/385: only the die-jar (sikulix.jar) should have a dep for python and jruby
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 19:26:17 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 4d2c6ab9dbce0129a14a1e75e78029e6c433dffb
Author: Raimund Hocke <info at its-me-raiman.de>
Date: Wed Feb 19 14:34:09 2014 +0100
only the die-jar (sikulix.jar) should have a dep for python and jruby
---
API/pom.xml | 14 ++------------
IDE/ide-jar.xml | 14 ++++++++++++--
IDE/pom.xml | 13 +++++++++----
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/API/pom.xml b/API/pom.xml
index dcee6ff..84ded9d 100755
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -25,16 +25,6 @@
<dependencies>
<dependency>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Jython</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-JRuby</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sikuli</groupId>
<artifactId>SikuliX-Basics</artifactId>
<version>${project.version}</version>
</dependency>
@@ -62,7 +52,7 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -70,7 +60,7 @@
<configuration>
<mainClass>org.sikuli.script.SikuliX</mainClass>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/IDE/ide-jar.xml b/IDE/ide-jar.xml
index cd03a51..e7a0610 100644
--- a/IDE/ide-jar.xml
+++ b/IDE/ide-jar.xml
@@ -21,7 +21,7 @@
<groupId>org.sikuli</groupId>
<artifactId>SikuliX-IDE</artifactId>
<version>1.1.0-Beta1</version>
-
+
<dependencies>
<dependency>
<groupId>org.sikuli</groupId>
@@ -29,6 +29,16 @@
<version>1.1.0</version>
</dependency>
<dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Jython</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-JRuby</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
@@ -71,7 +81,7 @@
<manifest>
<mainClass>org.sikuli.ide.SikuliIDE</mainClass>
</manifest>
- </archive>
+ </archive>
<descriptors>
<descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
diff --git a/IDE/pom.xml b/IDE/pom.xml
index c6db608..50a9637 100755
--- a/IDE/pom.xml
+++ b/IDE/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.sikuli</groupId>
<artifactId>SikuliX-IDE</artifactId>
<version>1.1.0</version>
-
+
<dependencies>
<dependency>
<groupId>org.sikuli</groupId>
@@ -34,6 +34,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-JRuby</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
@@ -70,7 +75,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
- has problems with excluded files; excluding doesn't work for me
+ has problems with excluded files; excluding doesn't work for me
<skip>true</skip>
</configuration>
</plugin>-->
@@ -84,7 +89,7 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -92,7 +97,7 @@
<configuration>
<mainClass>org.sikuli.ide.SikuliIDE</mainClass>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
--
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