[sikuli] 96/385: more preps for beta

[Gilles Filippini]

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 d7c8cd0516c980bd8938b27315600f5e841436ee
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Fri Jan 3 15:04:03 2014 +0100

    more preps for beta
---
 API/java-jar.xml     | 5 +++++
 API/script-jar.xml   | 5 +++++
 Basics/setup-jar.xml | 7 ++++---
 complete.xml         | 1 -
 plain.xml            | 1 -
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/API/java-jar.xml b/API/java-jar.xml
index fe1c92a..0436263 100644
--- a/API/java-jar.xml
+++ b/API/java-jar.xml
@@ -29,6 +29,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/script-jar.xml b/API/script-jar.xml
index 95d17bb..19cc67a 100644
--- a/API/script-jar.xml
+++ b/API/script-jar.xml
@@ -25,6 +25,11 @@
 	<dependencies>
     <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/Basics/setup-jar.xml b/Basics/setup-jar.xml
index 39ffda7..06cced7 100644
--- a/Basics/setup-jar.xml
+++ b/Basics/setup-jar.xml
@@ -73,9 +73,10 @@
               <mainClass>org.sikuli.basics.RunSetup</mainClass>
             </manifest>
           </archive> 
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
+					<descriptors>
+						<descriptor>../${sikuli.jartype}</descriptor>
+					</descriptors>
+					<finalName>${sikuli.jarname}-java</finalName>
           <finalName>sikuli-setup-${project.version}</finalName>
         </configuration>
         <executions>
diff --git a/complete.xml b/complete.xml
index 7dbe773..6e8e2d2 100644
--- a/complete.xml
+++ b/complete.xml
@@ -1,7 +1,6 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
           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>
   <formats>
     <format>jar</format>
diff --git a/plain.xml b/plain.xml
index a886280..658a61a 100644
--- a/plain.xml
+++ b/plain.xml
@@ -1,7 +1,6 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
           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>plain</id>
   <formats>
     <format>jar</format>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git