From 5fce9c1798344fd4d22760fbeb4b25e7a8d36e65 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Sun, 14 Jul 2013 11:50:11 +0000
Subject: [PATCH] refactored standard POM into master and standard refs 1411
---
fortiss-std-env/maven-build/master-pom.xml | 97 ++++++++++++++++++++++
fortiss-std-env/maven-build/pom.xml | 77 ++---------------
2 files changed, 104 insertions(+), 70 deletions(-)
create mode 100644 fortiss-std-env/maven-build/master-pom.xml
diff --git a/fortiss-std-env/maven-build/master-pom.xml b/fortiss-std-env/maven-build/master-pom.xml
new file mode 100644
index 0000000..bf040ea
--- /dev/null
+++ b/fortiss-std-env/maven-build/master-pom.xml
@@ -0,0 +1,97 @@
+<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.fortiss.std.pom</groupId>
+ <artifactId>std-parent-pom-master</artifactId>
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+
+ <name>fortiss Master POM</name>
+ <properties>
+ <tycho-version>0.18.0</tycho-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- enable tycho build extension -->
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <includes>
+ <include>**/AllTests.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>0.18.0</version>
+ </plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>
+ tycho-packaging-plugin
+ </artifactId>
+ <versionRange>
+ [0.18.0,)
+ </versionRange>
+ <goals>
+ <goal>build-qualifier</goal>
+ <goal>validate-id</goal>
+ <goal>validate-version</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>
+ tycho-compiler-plugin
+ </artifactId>
+ <versionRange>
+ [0.18.0,)
+ </versionRange>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
diff --git a/fortiss-std-env/maven-build/pom.xml b/fortiss-std-env/maven-build/pom.xml
index bdd266a..afc412d 100644
--- a/fortiss-std-env/maven-build/pom.xml
+++ b/fortiss-std-env/maven-build/pom.xml
@@ -7,11 +7,7 @@
<packaging>pom</packaging>
<name>fortiss Standard Parent POM (Indigo based)</name>
- <properties>
- <tycho-version>0.18.0</tycho-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
+
<repositories>
<!-- configure p2 repository to resolve against -->
<repository>
@@ -41,69 +37,10 @@
</repository>
</repositories>
- <build>
- <plugins>
- <plugin>
- <!-- enable tycho build extension -->
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>
- tycho-packaging-plugin
- </artifactId>
- <versionRange>
- [0.18.0,)
- </versionRange>
- <goals>
- <goal>build-qualifier</goal>
- <goal>validate-id</goal>
- <goal>validate-version</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>
- tycho-compiler-plugin
- </artifactId>
- <versionRange>
- [0.18.0,)
- </versionRange>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <parent>
+ <groupId>org.fortiss.std.pom</groupId>
+ <artifactId>std-parent-pom-master</artifactId>
+ <version>1.0</version>
+ <relativePath>master-pom.xml</relativePath>
+ </parent>
</project>
\ No newline at end of file
--
GitLab