Materialize x86_64 linux only

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index ebf79512d011300bc09a78be846984ab1d04969a..c68377472ec854ee83ae60112b6553e9b5e12eab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,9 @@
 <?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">
        <modelVersion>4.0.0</modelVersion>
 <?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">
        <modelVersion>4.0.0</modelVersion>

+       <prerequisites>
+               <maven>3.0</maven>
+       </prerequisites>

        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
        <version>3.0.6-SNAPSHOT</version>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
        <version>3.0.6-SNAPSHOT</version>


@@ -13,6 +16,7 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>
                <tycho.version>0.12.0</tycho.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>
                <tycho.version>0.12.0</tycho.version>

+               <taxeditor.version>3.0.6-SNAPSHOT</taxeditor.version>

        </properties>
        <modules>
                <module>eu.etaxonomy.taxeditor.cdmlib</module>
        </properties>
        <modules>
                <module>eu.etaxonomy.taxeditor.cdmlib</module>


@@ -96,6 +100,14 @@
                                <version>${tycho.version}</version>
                                <extensions>true</extensions>
                        </plugin>
                                <version>${tycho.version}</version>
                                <extensions>true</extensions>
                        </plugin>

+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-packaging-plugin</artifactId>
+                               <version>${tycho.version}</version>
+                               <configuration>
+                                       <strictVersions>true</strictVersions>
+                               </configuration>
+                       </plugin>

                        <plugin>
                                <groupId>org.eclipse.tycho</groupId>
                                <artifactId>target-platform-configuration</artifactId>
                        <plugin>
                                <groupId>org.eclipse.tycho</groupId>
                                <artifactId>target-platform-configuration</artifactId>


@@ -106,28 +118,28 @@
                                                <artifact>
                                                        <groupId>eu.etaxonomy</groupId>
                                                        <artifactId>eu.etaxonomy.taxeditor</artifactId>
                                                <artifact>
                                                        <groupId>eu.etaxonomy</groupId>
                                                        <artifactId>eu.etaxonomy.taxeditor</artifactId>

-                                                       <version>3.0.6-SNAPSHOT</version>
+                                                       <version>${taxeditor.version}</version>

                                                        <classifier>rcp</classifier>
                                                </artifact>
                                        </target>
                                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
                                        <environments>
                                                        <classifier>rcp</classifier>
                                                </artifact>
                                        </target>
                                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
                                        <environments>

-                                               <environment>
+                                               <!--environment>

                                                        <os>macosx</os>
                                                        <ws>cocoa</ws>
                                                        <arch>x86_64</arch>
                                                        <os>macosx</os>
                                                        <ws>cocoa</ws>
                                                        <arch>x86_64</arch>

-                                               </environment>
+                                               </environment-->

                                                <!--environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>
                                                        <arch>x86</arch>
                                                <!--environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>
                                                        <arch>x86</arch>

-                                               </environment>
+                                               </environment-->

                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>
                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>

-                                                       <arch>x86</arch>
+                                                       <arch>x86_64</arch>

                                                </environment>
                                                </environment>

-                                               <environment>
+                                               <!--environment>

                                                        <os>linux</os>
                                                        <ws>gtk</ws>
                                                        <arch>x86_64</arch>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>
                                                        <arch>x86_64</arch>


@@ -239,11 +251,11 @@
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <version>2.3.1</version>
                                </plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <version>2.3.1</version>
                                </plugin>

-                               <plugin>
+                               <!--plugin>

                                        <groupId>org.eclipse.tycho</groupId>
                                        <artifactId>tycho-packaging-plugin</artifactId>
                                        <groupId>org.eclipse.tycho</groupId>
                                        <artifactId>tycho-packaging-plugin</artifactId>

-                                       <version>${tycho.version}</version>
-                                       <!--executions>
+                                       <version>${tycho.version}</version-->
+                               <!--executions>

                                                <execution>
                                                        <id>timestamp</id>
                                                        <phase>validate</phase>
                                                <execution>
                                                        <id>timestamp</id>
                                                        <phase>validate</phase>


@@ -252,9 +264,9 @@
                                                        </goals>
                                                </execution>
                                        </executions-->
                                                        </goals>
                                                </execution>
                                        </executions-->

-                                       <!-- for some reason configuration won't work here, have to define
+                               <!-- for some reason configuration won't work here, have to define

                                        in each module -->
                                        in each module -->

-                                       <configuration>
+                               <!--configuration>

                                                <archive>
                                                        <addMavenDescriptor>false</addMavenDescriptor>
                                                </archive>
                                                <archive>
                                                        <addMavenDescriptor>false</addMavenDescriptor>
                                                </archive>


@@ -266,7 +278,7 @@
                                                        </environment>
                                                </environments>
                                        </configuration>
                                                        </environment>
                                                </environments>
                                        </configuration>

-                               </plugin>
+                               </plugin-->

                        </plugins>
                </pluginManagement>
        </build>
                        </plugins>
                </pluginManagement>
        </build>