Author: kmorin Date: 2009-08-27 17:01:14 +0200 (Thu, 27 Aug 2009) New Revision: 1623 Modified: trunk/guix-compiler-gwt/pom.xml trunk/guix-test-gwt/pom.xml trunk/pom.xml Log: put the profiles into the superpom and replaced the platform property by gwtplatform Modified: trunk/guix-compiler-gwt/pom.xml =================================================================== --- trunk/guix-compiler-gwt/pom.xml 2009-08-27 14:53:24 UTC (rev 1622) +++ trunk/guix-compiler-gwt/pom.xml 2009-08-27 15:01:14 UTC (rev 1623) @@ -44,14 +44,14 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <type>zip</type> - <classifier>${platform}-libs</classifier> + <classifier>${gwtplatform}-libs</classifier> <scope>libs</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <classifier>${platform}</classifier> + <classifier>${gwtplatform}</classifier> <scope>provided</scope> </dependency> @@ -106,7 +106,7 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <version>${gwt.version}</version> - <classifier>${platform}-libs</classifier> + <classifier>${gwtplatform}-libs</classifier> <type>zip</type> <overWrite>false</overWrite> <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory> @@ -119,45 +119,6 @@ </plugins> </build> - <profiles> - <profile> - <id>gwt-dev-windows</id> - <properties> - <platform>windows</platform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>windows</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-mac</id> - <properties> - <platform>mac</platform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>mac</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-linux</id> - <activation> - <activeByDefault>true</activeByDefault> - <os> - <name>Linux</name> - </os> - </activation> - <properties> - <platform>linux</platform> - </properties> - </profile> - </profiles> - <repositories> <repository> <id>gwt-maven</id> Modified: trunk/guix-test-gwt/pom.xml =================================================================== --- trunk/guix-test-gwt/pom.xml 2009-08-27 14:53:24 UTC (rev 1622) +++ trunk/guix-test-gwt/pom.xml 2009-08-27 15:01:14 UTC (rev 1623) @@ -28,14 +28,14 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <type>zip</type> - <classifier>${platform}-libs</classifier> + <classifier>${gwtplatform}-libs</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <classifier>${platform}</classifier> + <classifier>${gwtplatform}</classifier> <scope>provided</scope> </dependency> @@ -155,7 +155,7 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <version>${gwt.version}</version> - <classifier>${platform}-libs</classifier> + <classifier>${gwtplatform}-libs</classifier> <type>zip</type> <overWrite>false</overWrite> <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory> @@ -217,45 +217,6 @@ </plugins> </build> - <profiles> - <profile> - <id>gwt-dev-windows</id> - <properties> - <platform>windows</platform> - </properties> - <activation> - <activeByDefault>true</activeByDefault> - <os> - <family>windows</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-mac</id> - <properties> - <platform>mac</platform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>mac</family> - </os> - </activation> - </profile> - <profile> - <id>gwt-dev-linux</id> - <activation> - <activeByDefault>true</activeByDefault> - <os> - <name>Linux</name> - </os> - </activation> - <properties> - <platform>linux</platform> - </properties> - </profile> - </profiles> - <repositories> <repository> <id>gwt-maven</id> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-27 14:53:24 UTC (rev 1622) +++ trunk/pom.xml 2009-08-27 15:01:14 UTC (rev 1623) @@ -171,7 +171,7 @@ <artifactId>gwt-dev</artifactId> <version>${gwt.version}</version> <type>zip</type> - <classifier>${platform}-libs</classifier> + <classifier>${gwtplatform}-libs</classifier> <scope>provided</scope> </dependency> @@ -179,7 +179,7 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <version>${gwt.version}</version> - <classifier>${platform}</classifier> + <classifier>${gwtplatform}</classifier> <scope>provided</scope> </dependency> @@ -241,5 +241,44 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/guix/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/guix/trunk</url> </scm> + + <profiles> + <profile> + <id>gwt-dev-windows</id> + <properties> + <gwtplatform>windows</gwtplatform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>windows</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-mac</id> + <properties> + <gwtplatform>mac</gwtplatform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>mac</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-linux</id> + <activation> + <activeByDefault>true</activeByDefault> + <os> + <name>Linux</name> + </os> + </activation> + <properties> + <gwtplatform>linux</gwtplatform> + </properties> + </profile> + </profiles> </project>