[sikuli] 08/30: New patch parent-pom.patch
Gilles Filippini
pini at alioth.debian.org
Mon Nov 4 09:03:01 UTC 2013
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 060b9ccd0dbe54f7010e86dbca3d6d63107033b4
Author: Gilles Filippini <pini at debian.org>
Date: Thu Oct 31 16:16:08 2013 +0100
New patch parent-pom.patch
Aggregate all the subprojects into one parent maven project.
---
debian/patches/parent-pom.patch | 176 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 177 insertions(+)
diff --git a/debian/patches/parent-pom.patch b/debian/patches/parent-pom.patch
new file mode 100644
index 0000000..31ac27a
--- /dev/null
+++ b/debian/patches/parent-pom.patch
@@ -0,0 +1,176 @@
+Description: One pom.xml to rule them all
+ The Sikuli source tree is composed of five distinct subprojects. This patch
+ aggregates theses subprojects into one Maven parent project.
+Author: Gilles Filippini <pini at debian.org>
+Index: sikuli/api/pom.xml
+===================================================================
+--- sikuli.orig/api/pom.xml 2013-10-21 12:38:38.000000000 +0200
++++ sikuli/api/pom.xml 2013-10-21 12:38:38.000000000 +0200
+@@ -8,6 +8,12 @@
+ *
+ * RaiMan 2013
+ -->
++ <parent>
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ </parent>
++
+
+ <modelVersion>4.0.0</modelVersion>
+
+Index: sikuli/basics/pom.xml
+===================================================================
+--- sikuli.orig/basics/pom.xml 2013-10-21 12:38:38.000000000 +0200
++++ sikuli/basics/pom.xml 2013-10-21 12:38:38.000000000 +0200
+@@ -7,6 +7,11 @@
+ *
+ * RaiMan 2013
+ -->
++ <parent>
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+Index: sikuli/ide/pom.xml
+===================================================================
+--- sikuli.orig/ide/pom.xml 2013-10-21 12:38:38.000000000 +0200
++++ sikuli/ide/pom.xml 2013-10-21 12:38:38.000000000 +0200
+@@ -8,6 +8,12 @@
+ *
+ * RaiMan 2013
+ -->
++ <parent>
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ </parent>
++
+
+ <modelVersion>4.0.0</modelVersion>
+
+Index: sikuli/pom.xml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sikuli/pom.xml 2013-10-21 12:42:58.000000000 +0200
+@@ -0,0 +1,85 @@
++<?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">
++
++ <modelVersion>4.0.0</modelVersion>
++
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ <packaging>pom</packaging>
++
++ <name>SikuliX</name>
++ <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>
++ </properties>
++
++ <modules>
++ <module>vision-proxy</module>
++ <module>basics</module>
++ <module>jython</module>
++ <module>api</module>
++ <module>ide</module>
++ </modules>
++
++ <dependencies>
++ </dependencies>
++
++ <build>
++ <finalName>sikulix</finalName>
++
++ <plugins>
++ <plugin>
++ <groupId>org.codehaus.mojo</groupId>
++ <artifactId>exec-maven-plugin</artifactId>
++ <version>1.1.1</version>
++ <executions>
++ <execution>
++ <id>make-all</id>
++ <phase>compile</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/usr/bin/make</executable>
++ <arguments>
++ <argument>-C</argument>
++ <argument>vision-proxy</argument>
++ <argument>all</argument>
++ </arguments>
++ </configuration>
++ </execution>
++ <execution>
++ <id>make-clean</id>
++ <phase>clean</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/usr/bin/make</executable>
++ <arguments>
++ <argument>-C</argument>
++ <argument>vision-proxy</argument>
++ <argument>clean</argument>
++ </arguments>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++</project>
+Index: sikuli/jython/pom.xml
+===================================================================
+--- sikuli.orig/jython/pom.xml 2013-10-21 12:38:38.000000000 +0200
++++ sikuli/jython/pom.xml 2013-10-21 12:38:38.000000000 +0200
+@@ -8,6 +8,11 @@
+ *
+ * kelthuzad, RaiMan 2013
+ -->
++ <parent>
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+Index: sikuli/vision-proxy/pom.xml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sikuli/vision-proxy/pom.xml 2013-10-21 12:44:11.000000000 +0200
+@@ -7,6 +7,11 @@
+ *
+ * RaiMan 2013
+ -->
++ <parent>
++ <groupId>org.sikuli</groupId>
++ <artifactId>SikuliX</artifactId>
++ <version>1.0.1</version>
++ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
diff --git a/debian/patches/series b/debian/patches/series
index 884c6e6..5d041a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ setTextAndMnemonic.patch
printhelp.patch
autotoolize-vision-proxy.patch
+parent-pom.patch
--
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