Revision: 849 Author: heuermh Date: Wed Oct 28 18:32:42 2009 Log: Issue 126 ; attempting to use a version range specifier, will grab 3.3.0-v3346 from maven central repo where available, or will require user to install manually where not available, e.g. macosx_cocoa_intel profile http://code.google.com/p/piccolo2d/source/detail?r=849
Modified: /piccolo2d.java/trunk/swt/pom.xml ======================================= --- /piccolo2d.java/trunk/swt/pom.xml Wed Oct 28 07:58:59 2009 +++ /piccolo2d.java/trunk/swt/pom.xml Wed Oct 28 18:32:42 2009 @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_0_0.xsd";> +<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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>piccolo2d-parent</artifactId> @@ -12,24 +10,6 @@ <artifactId>piccolo2d-swt</artifactId> <packaging>bundle</packaging> <name>Piccolo2D SWT</name> - <url>http://code.google.com/p/piccolo2d/</url> - <description> - A revolutionary way to create robust, full-featured graphical applications in Java and C#, with striking visual effects such as zooming, animation and multiple representations. - </description> -<!-- - <repositories> - <repository> - <id>Maven default</id> - <name>Apache repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - <repository> - <id>Apache Directory SVN Repo Cheat</id> - <name>Apache Directory SVN Repo Cheat</name> - <url>https://svn.apache.org/repos/asf/directory/studio/trunk/repository</url> - </repository> - </repositories> ---> <dependencies> <dependency> <groupId>org.piccolo2d</groupId> @@ -39,23 +19,51 @@ <dependency> <groupId>${swt.groupId}</groupId> <artifactId>${swt.artifactId}</artifactId> -<!-- <version>3.5.0.v3550b</version> --> - <version>3.3.0-v3346</version> + <version>[3.3.0-v3346,)</version> <scope>compile</scope> </dependency> </dependencies> <scm> - <connection> - scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt - </connection> - <developerConnection> - scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt - </developerConnection> + <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt</connection> + <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt</developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/swt</url> </scm> <reporting> +<!-- <plugins> - <!-- don't use UmlGraph as the current settings (see ../parent/pom.xml) cause pain with swt --> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + </plugin> + </plugins> +--> + <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> @@ -165,8 +173,6 @@ <properties> <swt.groupId>org.eclipse.swt.gtk.linux</swt.groupId> <swt.artifactId>x86_64</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> </properties> </profile> <profile> @@ -180,8 +186,6 @@ <properties> <swt.groupId>org.eclipse.swt.gtk.linux</swt.groupId> <swt.artifactId>x86_64</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> </properties> </profile> <profile> @@ -195,8 +199,6 @@ <properties> <swt.groupId>org.eclipse.swt.gtk.linux</swt.groupId> <swt.artifactId>x86</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> </properties> </profile> <profile> @@ -210,8 +212,6 @@ <properties> <swt.groupId>org.eclipse.swt.gtk.linux</swt.groupId> <swt.artifactId>x86</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> </properties> </profile> <profile> @@ -224,35 +224,48 @@ <properties> <swt.groupId>org.eclipse.swt.win32.win32</swt.groupId> <swt.artifactId>x86</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> + </properties> + </profile> + <profile> + <id>macosx_carbon_ppc</id> + <activation> + <os> + <name>mac os x</name> + <arch></arch> + </os> + </activation> + <properties> + <swt.groupId>org.eclipse.swt.carbon</swt.groupId> + <swt.artifactId>macosx</swt.artifactId> </properties> </profile> <!-- - - - todo: - - the following mac profile does not work on PPC - need to test mac profile on intel - - consider adding: gtk linux ppc - gtk linux i686 (assume that uses x86 swt version) - gtk solaris sparc - motif aix ppc + must manually enable this one to override macosx_carbon_ppc + <profile> + <id>macosx_cocoa_ppc</id> + <activation> + <os> + <name>mac os x</name> + <arch></arch> + </os> + </activation> + <properties> + <swt.groupId>org.eclipse.swt.cocoa</swt.groupId> + <swt.artifactId>macosx</swt.artifactId> + </properties> + </profile> --> <profile> - <id>mac</id> + <id>macosx_cocoa_intel</id> <activation> <os> <name>mac os x</name> + <arch></arch> </os> </activation> <properties> - <swt.groupId>org.eclipse.swt.carbon</swt.groupId> + <swt.groupId>org.eclipse.swt.cocoa</swt.groupId> <swt.artifactId>macosx</swt.artifactId> -<!-- <swt.version>3.5.0.v3550b</swt.version> --> - <swt.version>3.3.0-v3346</swt.version> </properties> </profile> </profiles> --~--~---------~--~----~------------~-------~--~----~ Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en -~----------~----~----~----~------~----~------~--~---
