Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Villiger2015-04-07 12:37:48 -0400
committerMatthias Villiger2015-04-07 12:37:48 -0400
commit8bdd91f48a8bfed7fc3b195b22b17d1ce620a825 (patch)
tree1b31bcd46260045ce8066f98de2745f6055af809
parentbfa39b66c34c46e576087d439966fc5bc2f6f2a6 (diff)
downloadorg.eclipse.scout-aggregator-develop.tar.gz
org.eclipse.scout-aggregator-develop.tar.xz
org.eclipse.scout-aggregator-develop.zip
Bug 458143 - Enable Scout for pure Java applications (without osgi)develop
https://bugs.eclipse.org/bugs/show_bug.cgi?id=458143 Switch to maven-standard build
-rw-r--r--[-rwxr-xr-x]org.eclipse.scout.parent/pom.xml504
1 files changed, 15 insertions, 489 deletions
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index d5cbfa8..60484b0 100755..100644
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012 BSI Business Systems Integration AG.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Stephan Leicht Vogt - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!-- Copyright (c) 2012 BSI Business Systems Integration AG. All rights reserved.
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html Contributors:
+ Stephan Leicht Vogt - initial implementation -->
+<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>
@@ -70,84 +64,22 @@
<scout.version>5.1.0-SNAPSHOT</scout.version>
- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
- <tycho.version>0.20.0</tycho.version>
- <tycho-extras.version>0.20.0</tycho-extras.version>
<cbi-plugins.version>1.0.5</cbi-plugins.version>
<jarsigner.version>1.0.5</jarsigner.version>
- <compileSource>1.6</compileSource>
+ <compileSource>1.7</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <target-platform>eclipse-helios</target-platform>
- <rap-repo-target-platform>eclipse-staging</rap-repo-target-platform>
-
- <tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
- <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
<cbi-jdt-version>3.10.0.v20140604-1726</cbi-jdt-version>
<cbi-snapshots-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-snapshots-repo.url>
- <eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
-<!-- UI-Test (Tycho-Tests) Arguments -->
- <ui.test.vmargs.all>${tycho.testArgLine} -Xms512m -Xmx1024m -XX:MaxPermSize=256m -DbuildingWithTycho=true</ui.test.vmargs.all>
+ <!-- UI-Test (Tycho-Tests) Arguments -->
+ <ui.test.vmargs.all>-Xms512m -Xmx1024m -XX:MaxPermSize=256m </ui.test.vmargs.all>
<ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
<ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
</properties>
- <repositories>
- <repository>
- <id>eclipse</id>
- <url>${eclipse-repo.url}</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>tycho</id>
- <url>${tycho-repo.url}</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
- <id>cbi-snapshots</id>
- <url>${cbi-snapshots-repo.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
- <id>eclipse</id>
- <url>${eclipse-repo.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
- <id>cbi-jdt</id>
- <url>${cbi-jdt-repo.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<testResources>
<testResource>
@@ -159,84 +91,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <filters>
- <!-- work around Equinox bug 348045 -->
- <filter>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
- <removeAll />
- </filter>
- </filters>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- <target>
- <artifact>
- <groupId>org.eclipse.scout</groupId>
- <artifactId>org.eclipse.scout.target</artifactId>
- <version>${scout.version}</version>
- <classifier>${target-platform}</classifier>
- </artifact>
- </target>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>ppc64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>s390</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>s390x</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>sparc</arch>
- </environment>
- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
- <plugin>
<!-- Used for attaching target-files to the artifact in org.eclipse.scout.target -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -244,187 +98,12 @@
</plugin>
<plugin>
- <!-- Activates Tycho so Maven knows the new packaging types eclipse-plugin... -->
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-cbi-plugin</artifactId>
<version>${cbi-plugins.version}</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${cbi-jdt-version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <source>${compileSource}</source>
- <encoding>${project.build.sourceEncoding}</encoding>
- <showWarnings>true</showWarnings>
- <showDeprecation>true</showDeprecation>
- <extraClasspathElements>
- <extraClasspathElement>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.3</version>
- </extraClasspathElement>
- <extraClasspathElement>
- <groupId>javax.jms</groupId>
- <artifactId>jms-api</artifactId>
- <version>1.1-rev-1</version>
- </extraClasspathElement>
- <extraClasspathElement>
- <groupId>jdk</groupId>
- <artifactId>tools.jar</artifactId>
- <version>1.0.0</version>
- <scope>system</scope>
- <systemPath>${tools-jar}</systemPath>
- </extraClasspathElement>
- </extraClasspathElements>
- <compilerArgument>-warn:-deprecation,raw,unchecked</compilerArgument>
- <compilerArguments>
- <inlineJSR />
- <enableJavadoc />
- <encoding>${project.build.sourceEncoding}</encoding>
- <log>${project.build.directory}/@dot.xml</log>
- </compilerArguments>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- <format>yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider>
- <!-- Prevent build from failing due to a dirty git working tree -->
- <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
- <jgit.ignore>
- pom.xml
- </jgit.ignore>
- <sourceReferences>
- <generate>true</generate>
- </sourceReferences>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- <additionalFileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>.api_description</include>
- </includes>
- </fileSet>
- </additionalFileSets>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <!-- <debugPort>5050</debugPort> -->
- <!-- don't run tests in UI thread and harness per default (i.e., run them headless) -->
- <!-- see http://wiki.eclipse.org/Minerva#Headless_Tests -->
- <!-- see http://wiki.eclipse.org/Tycho/Packaging_Types#eclipse-test-plugin for semantics of useUIHarness etc. -->
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <!-- Convention: We don't use test suites. All Test classes should end with "*Test.java". Everything else is not executed by default. -->
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <!-- Kill test JVM if tests take more than 5 minutes (300 seconds) to finish -->
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <!-- do not abort on test failures -->
-            <failIfNoTests>false</failIfNoTests>
-            <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras.version}</version>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-custom-bundle-plugin</artifactId>
- <version>${tycho-extras.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <baselineMode>warn</baselineMode>
- <baselineReplace>none</baselineReplace>
- <baselineRepositories>
- <repository>
- <url>${comparator.repo}</url>
- </repository>
- </baselineRepositories>
- </configuration>
- </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@@ -459,21 +138,10 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
- <!--Use this plugin to set the version to a release or snapshot in Manifests, poms, repositories-->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-versions-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
@@ -487,28 +155,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -550,6 +196,7 @@
</properties>
</profile>
+<!--
<profile>
<id>eclipse-sign</id>
<build>
@@ -690,28 +337,7 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>bree-libs</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <!-- this tells Tycho to use JRE libraries that match bundle
- runtime execution environment http://wiki.eclipse.org/Tycho/Release_Notes/0.14
- TODO provide CBI-specific wiki that explains how to setup BREE libraries
- and toolchain.xml -->
- <useJDK>BREE</useJDK>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
+-->
<profile>
<id>noJacoco</id>
@@ -775,109 +401,9 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>platform-staging</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>staging</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-staging</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-mars-i</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>mars_I</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-mars-integration</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-helios</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>helios</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-helios</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-indigo</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>indigo</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-indigo</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-juno</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>juno</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-juno</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-kepler</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>kepler</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-kepler</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-luna</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>luna</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-luna</target-platform>
- </properties>
- </profile>
-
- <profile>
- <id>platform-mars</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>mars</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-mars</target-platform>
- </properties>
- </profile>
</profiles>
+
+ <modules>
+ <module>../../org.eclipse.scout.rt</module>
+ </modules>
</project>

Back to the top