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 9e23552add3804d668840d042f1f365ecb0a718b Author: Raimund Hocke <[email protected]> Date: Sun Dec 29 12:37:05 2013 +0100 some optimisations in the POMs --- .gitignore | 3 ++- API/pom.xml | 29 +++++++++++++++++++++++++++++ Basics/pom.xml | 8 ++++++++ IDE/pom.xml | 10 +++++++++- Libs/pom.xml | 1 + MacApp/pom.xml | 1 + Natives/pom.xml | 49 +++++++++++++------------------------------------ OpenCV/pom.xml | 2 ++ Tesseract/pom.xml | 2 ++ 9 files changed, 67 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index fd9943e..fad59a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -**/target*/* +target*/ .idea *.iml +stuff/ diff --git a/API/pom.xml b/API/pom.xml index f86e868..872252c 100755 --- a/API/pom.xml +++ b/API/pom.xml @@ -25,6 +25,11 @@ <dependencies> <dependency> <groupId>org.sikuli</groupId> + <artifactId>SikuliX-Jython</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.sikuli</groupId> <artifactId>SikuliX-Basics</artifactId> <version>1.1.0</version> </dependency> @@ -34,4 +39,28 @@ <version>2.4.7</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <archive> + <manifest> + <mainClass>org.sikuli.script.SikuliX</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <configuration> + <mainClass>org.sikuli.script.SikuliX</mainClass> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/Basics/pom.xml b/Basics/pom.xml index 7bc911b..22436b8 100755 --- a/Basics/pom.xml +++ b/Basics/pom.xml @@ -74,6 +74,14 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <configuration> + <mainClass>org.sikuli.basics.RunSetup</mainClass> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/IDE/pom.xml b/IDE/pom.xml index d188ae5..a647eb8 100755 --- a/IDE/pom.xml +++ b/IDE/pom.xml @@ -76,7 +76,15 @@ </manifest> </archive> </configuration> - </plugin> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <configuration> + <mainClass>org.sikuli.ide.SikuliIDE</mainClass> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/Libs/pom.xml b/Libs/pom.xml index 1ba824d..98d146d 100644 --- a/Libs/pom.xml +++ b/Libs/pom.xml @@ -34,6 +34,7 @@ </execution> </executions> </plugin> + <!-- to suppress javadocs in any case --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> diff --git a/MacApp/pom.xml b/MacApp/pom.xml index 34ec116..7b75028 100644 --- a/MacApp/pom.xml +++ b/MacApp/pom.xml @@ -35,6 +35,7 @@ </execution> </executions> </plugin> + <!-- to suppress javadocs in any case --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> diff --git a/Natives/pom.xml b/Natives/pom.xml index fd97f8b..2ae4cde 100644 --- a/Natives/pom.xml +++ b/Natives/pom.xml @@ -9,12 +9,12 @@ * 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> @@ -22,36 +22,13 @@ <artifactId>SikuliX-Natives</artifactId> <version>1.1.0</version> - <profiles> - <profile> - <id>Unix</id> - <activation> - <os> - <family>unix</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <executions> - <execution><!-- Run our version calculation script --> - <id>Make vision proxy</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>${basedir}/src/main/native/Vision/makeVisionProxy</executable> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <dependencies> + <dependency> + <groupId>org.sikuli</groupId> + <artifactId>SikuliX-Libs</artifactId> + <version>1.1.0</version> + </dependency> + </dependencies> <build> <defaultGoal>clean install</defaultGoal> diff --git a/OpenCV/pom.xml b/OpenCV/pom.xml index 79bcd81..df0eb83 100644 --- a/OpenCV/pom.xml +++ b/OpenCV/pom.xml @@ -25,6 +25,7 @@ <build> <defaultGoal>clean install</defaultGoal> <plugins> + <!-- to suppress sources in any case --> <plugin> <artifactId>maven-source-plugin</artifactId> <version>2.2.1</version> @@ -35,6 +36,7 @@ </execution> </executions> </plugin> + <!-- to suppress javadocs in any case --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> diff --git a/Tesseract/pom.xml b/Tesseract/pom.xml index 2f98e7f..692e82d 100644 --- a/Tesseract/pom.xml +++ b/Tesseract/pom.xml @@ -30,6 +30,7 @@ <targetPath>META-INF/libs</targetPath> </resource> </resources> + <!-- to suppress sources in any case --> <plugins> <plugin> <artifactId>maven-source-plugin</artifactId> @@ -41,6 +42,7 @@ </execution> </executions> </plugin> + <!-- to suppress javadocs in any case --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
