[sikuli] 14/385: merged the parent pom in SikuliX with the top level module pom (SikuliX/pom is obsolete now)
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 19:25:42 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 65e39c9de97fe2688312571defab05b9e1292c77
Author: Raimund Hocke <rmhdevelop at me.com>
Date: Tue Dec 24 11:48:49 2013 +0100
merged the parent pom in SikuliX with the top level module pom (SikuliX/pom is obsolete now)
---
API/java-jar.xml | 6 +-
API/pom.xml | 4 +-
API/script-jar.xml | 6 +-
Basics/pom.xml | 4 +-
Basics/setup-jar.xml | 4 +-
Guide/pom.xml | 4 +-
IDE/ide-jar.xml | 6 +-
IDE/pom.xml | 4 +-
Jython/pom.xml | 4 +-
Libs/build.xml | 4 +-
Libs/pom.xml | 11 +-
MacApp/pom.xml | 7 ++
Natives/pom.xml | 12 ++-
OpenCV/pom.xml | 7 ++
Remote/pom.xml | 4 +-
SikuliX/pom.xml | 175 -------------------------------
Tesseract/pom.xml | 7 ++
SikuliX/complete.xml => complete.xml | 0
SikuliX/plain.xml => plain.xml | 0
pom.xml | 195 +++++++++++++++++++++++++++++------
20 files changed, 227 insertions(+), 237 deletions(-)
diff --git a/API/java-jar.xml b/API/java-jar.xml
index 1df3d34..fe1c92a 100644
--- a/API/java-jar.xml
+++ b/API/java-jar.xml
@@ -10,9 +10,9 @@
-->
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
<version>2.4</version>
<configuration>
<descriptors>
- <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ <descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
<finalName>${sikuli.jarname}-java</finalName>
</configuration>
diff --git a/API/pom.xml b/API/pom.xml
index 60ee767..f86e868 100755
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/API/script-jar.xml b/API/script-jar.xml
index e3afaa0..95d17bb 100644
--- a/API/script-jar.xml
+++ b/API/script-jar.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
</manifest>
</archive>
<descriptors>
- <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ <descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
<finalName>${sikuli.jarname}-script</finalName>
</configuration>
diff --git a/Basics/pom.xml b/Basics/pom.xml
index 119aaef..7bc911b 100755
--- a/Basics/pom.xml
+++ b/Basics/pom.xml
@@ -10,9 +10,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/Basics/setup-jar.xml b/Basics/setup-jar.xml
index ee041ea..39ffda7 100644
--- a/Basics/setup-jar.xml
+++ b/Basics/setup-jar.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/Guide/pom.xml b/Guide/pom.xml
index 37e5d7d..3dd6e48 100644
--- a/Guide/pom.xml
+++ b/Guide/pom.xml
@@ -10,9 +10,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/IDE/ide-jar.xml b/IDE/ide-jar.xml
index 486b551..4672539 100644
--- a/IDE/ide-jar.xml
+++ b/IDE/ide-jar.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -78,7 +78,7 @@
</manifest>
</archive>
<descriptors>
- <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ <descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
<finalName>${sikuli.jarname}-ide</finalName>
</configuration>
diff --git a/IDE/pom.xml b/IDE/pom.xml
index ef2e4a1..c446edf 100755
--- a/IDE/pom.xml
+++ b/IDE/pom.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/Jython/pom.xml b/Jython/pom.xml
index f229b4c..60ea2ec 100755
--- a/Jython/pom.xml
+++ b/Jython/pom.xml
@@ -11,9 +11,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/Libs/build.xml b/Libs/build.xml
index 43cc1ca..84a68ae 100644
--- a/Libs/build.xml
+++ b/Libs/build.xml
@@ -3,9 +3,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/Libs/pom.xml b/Libs/pom.xml
index 8191a44..7ff5edd 100644
--- a/Libs/pom.xml
+++ b/Libs/pom.xml
@@ -1,11 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+ * Copyright 2010-2013, Sikuli.org
+ * Released under the MIT License.
+ *
+ * RaiMan 2013
+ -->
+
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/MacApp/pom.xml b/MacApp/pom.xml
index 0da1c21..e2cd7d4 100644
--- a/MacApp/pom.xml
+++ b/MacApp/pom.xml
@@ -9,6 +9,13 @@
* RaiMan 2013
-->
+ <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>
diff --git a/Natives/pom.xml b/Natives/pom.xml
index 36db857..e9cec47 100644
--- a/Natives/pom.xml
+++ b/Natives/pom.xml
@@ -1,11 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+ * Copyright 2010-2013, Sikuli.org
+ * Released under the MIT License.
+ *
+ * RaiMan 2013
+ -->
+
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/OpenCV/pom.xml b/OpenCV/pom.xml
index b64d1fc..933d09b 100644
--- a/OpenCV/pom.xml
+++ b/OpenCV/pom.xml
@@ -9,6 +9,13 @@
* RaiMan 2013
-->
+ <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>
diff --git a/Remote/pom.xml b/Remote/pom.xml
index 8b99a3f..efbda81 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -10,9 +10,9 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
+ <artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <relativePath>../SikuliX</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/SikuliX/pom.xml b/SikuliX/pom.xml
deleted file mode 100755
index aea61e4..0000000
--- a/SikuliX/pom.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
- * Copyright 2010-2013, Sikuli.org
- * Released under the MIT License.
- *
- * RaiMan 2013
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-POM</artifactId>
- <version>1.1.0</version>
-
- <packaging>pom</packaging>
-
- <url>http://www.sikuli.org</url>
-
- <licenses>
- <license>
- <name>MIT License</name>
- <url>http://www.sikuli.org/LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <id>RaiMan</id>
- <name>RaiMan</name>
- <email>rmhdevelop at me.com</email>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <exclude.nativelayer.mac>NativeLayerForMac.java</exclude.nativelayer.mac>
- <exclude.nativelayer.null>NativeLayerForNothing</exclude.nativelayer.null>
- <sikuli.jartype>plain.xml</sikuli.jartype>
- <sikuli.jarname>${project.version}</sikuli.jarname>
- </properties>
-
- <repositories>
- <repository> <!-- needed for jxgrabkey -->
- <id>uni-due.de</id>
- <name>uni-due.de</name>
- <url>http://mvn.is.inf.uni-due.de:8081/nexus/content/repositories/atunes-dependencies/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.13</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>Windows</id>
- <activation>
- <os>
- <family>windows</family>
- </os>
- </activation>
- <properties>
- <sikuli.uselibs>META-INF/libs/windows/**/*</sikuli.uselibs>
- <exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
- </properties>
- </profile>
- <profile>
- <id>Unix</id>
- <activation>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <properties>
- <sikuli.uselibs>META-INF/libs/linux/**/*</sikuli.uselibs>
- <exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
- </properties>
- </profile>
- <profile>
- <id>Mac</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <sikuli.uselibs>META-INF/libs/mac/**/*</sikuli.uselibs>
- <exclude.nativelayer>${exclude.nativelayer.null}</exclude.nativelayer>
- </properties>
- </profile>
- <profile>
- <id>withLibs</id>
- <activation>
- <activeByDefault>no</activeByDefault>
- </activation>
- <properties>
- <sikuli.jartype>complete.xml</sikuli.jartype>
- <sikuli.jarname>sikuli</sikuli.jarname>
- </properties>
- </profile>
- <profile>
- <id>withAllLibs</id>
- <activation>
- <activeByDefault>no</activeByDefault>
- </activation>
- <properties>
- <sikuli.jarname>sikuli</sikuli.jarname>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Libs</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>withOCR</id>
- <activation>
- <activeByDefault>no</activeByDefault>
- </activation>
- <properties>
- <sikuli.jarname>sikuli</sikuli.jarname>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Tesseract</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/Tesseract/pom.xml b/Tesseract/pom.xml
index 8fe4a1d..49d1a1f 100644
--- a/Tesseract/pom.xml
+++ b/Tesseract/pom.xml
@@ -9,6 +9,13 @@
* RaiMan 2013
-->
+ <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>
diff --git a/SikuliX/complete.xml b/complete.xml
similarity index 100%
rename from SikuliX/complete.xml
rename to complete.xml
diff --git a/SikuliX/plain.xml b/plain.xml
similarity index 100%
rename from SikuliX/plain.xml
rename to plain.xml
diff --git a/pom.xml b/pom.xml
index 75873aa..dbfbca4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<artifactId>SikuliX</artifactId>
<version>1.1.0</version>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
<url>http://www.sikuli.org</url>
@@ -37,10 +37,130 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <exclude.nativelayer.mac>NativeLayerForMac.java</exclude.nativelayer.mac>
+ <exclude.nativelayer.null>NativeLayerForNothing</exclude.nativelayer.null>
+ <sikuli.jartype>plain.xml</sikuli.jartype>
+ <sikuli.jarname>${project.version}</sikuli.jarname>
</properties>
+ <repositories>
+ <repository> <!-- needed for jxgrabkey -->
+ <id>uni-due.de</id>
+ <name>uni-due.de</name>
+ <url>http://mvn.is.inf.uni-due.de:8081/nexus/content/repositories/atunes-dependencies/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>Windows</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <sikuli.uselibs>META-INF/libs/windows/**/*</sikuli.uselibs>
+ <exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
+ </properties>
+ </profile>
+ <profile>
+ <id>Unix</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <properties>
+ <sikuli.uselibs>META-INF/libs/linux/**/*</sikuli.uselibs>
+ <exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
+ </properties>
+ </profile>
+ <profile>
+ <id>Mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <sikuli.uselibs>META-INF/libs/mac/**/*</sikuli.uselibs>
+ <exclude.nativelayer>${exclude.nativelayer.null}</exclude.nativelayer>
+ </properties>
+ </profile>
+ <profile>
+ <id>withLibs</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jartype>complete.xml</sikuli.jartype>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ </profile>
+ <profile>
+ <id>withAllLibs</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Libs</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>withOCR</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Tesseract</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<modules>
- <module>SikuliX</module>
<module>OpenCV</module>
<module>Libs</module>
<module>Natives</module>
@@ -53,35 +173,44 @@
<module>Remote</module>
<module>Guide</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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