Commit f9bf8a24 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch '3620' into 'master'

3620

See merge request af3/fortiss-std-env!6
parents ae4a0470 31164de9
[submodule "target-definition"]
path = target-definition
url = https://git.fortiss.org/af3/target-definition.git
#!/bin/bash -e
if [ -f META-INF/MANIFEST.MF ]; then
ScriptLocation=`dirname "$0"`
PluginName=`grep -F "Bundle-SymbolicName: " META-INF/MANIFEST.MF | awk '{ print $2 }'`
PluginName=${PluginName%;*}
PluginVersion=`grep -F "Bundle-Version: " META-INF/MANIFEST.MF | awk '{ print $2 }'`
PluginVersion=${PluginVersion%.qualifier*}
echo 'Found Plugin Name: "'$PluginName'"'
echo 'Found Plugin Version: "'$PluginVersion'"'
echo "Fetching Template from $ScriptLocation"
sed -e "s/%PluginName%/$PluginName/g" \
-e "s/%PluginVersion%/$PluginVersion/g" \
$ScriptLocation/template-pom.xml > ./pom.xml
echo 'Generated pom.xml.'
else
echo 'Directory contains no META-INF/MANIFEST.MF'
exit 1;
fi
\ No newline at end of file
<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.23.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>
<testFailureIgnore>true</testFailureIgnore>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<argLine>-Xms256m -Xmx512m</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.23.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.23.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.23.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
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Maven Build Target Platform" sequenceNumber="8">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/technology/nebula/snapshot"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/eclipse/updates/3.7"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/indigo/"/>
</location>
<location path="${eclipse_home}" type="Profile"/>
</locations>
<environment>
<arch>x86_64</arch>
<nl>de_DE</nl>
</environment>
</target>
<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</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<name>fortiss Standard Parent POM (Indigo based)</name>
<repositories>
<!-- configure p2 repository to resolve against -->
<repository>
<id>kepler-release</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/kepler</url>
</repository>
<repository>
<!-- Juno site is needed to provide Junit4 -->
<id>juno-release</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/juno</url>
</repository>
<repository>
<id>kepler-SR2</id>
<layout>p2</layout>
<url>http://download.eclipse.org/eclipse/updates/4.3</url>
</repository>
<repository>
<id>nebula</id>
<layout>p2</layout>
<url>http://download.eclipse.org/technology/nebula/snapshot</url>
</repository>
<repository>
<id>swtbot</id>
<layout>p2</layout>
<url>http://download.eclipse.org/technology/swtbot/releases/latest/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</url>
</repository>
</repositories>
<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
#!/bin/bash
for gm in `find . -wholename '*/model/*.genmodel'`; do
echo Processing $gm ...
sed -i -e 's/body=".*"\/>/\/>/g' $gm
sed -i -e 's/body=".*">/>/g' $gm
echo Safety grep ...
cat $gm | grep body
echo End of Safety
done
#!/bin/bash -e
ScriptLocation=`dirname "$0"`
for plugin in `find . -name 'META-INF' -printf '%h '`; do
echo 'Entering '$plugin' ...'
cd $plugin
../$ScriptLocation/create-pom-xml.sh
echo 'Exiting '$plugin' ...'
cd ..
echo
done
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!-- (c) 2018 fortiss GmbH -->
<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.af3</groupId>
<artifactId>%PluginName%</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.fortiss.std.pom</groupId>
<artifactId>std-parent-pom</artifactId>
<version>1.0</version>
<relativePath>../../parent-pom.xml</relativePath>
</parent>
<version>%PluginVersion%-SNAPSHOT</version>
</project>
\ No newline at end of file
......@@ -3,24 +3,18 @@
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:com.github.maybeec.oomph.task="http://maybeec.github.io/oomph-task-unzip/1.0"
xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
xsi:schemaLocation="http://maybeec.github.io/oomph-task-unzip/1.0 https://raw.githubusercontent.com/maybeec/oomph-task-unzip/master/task-unzip-updatesite/model/Oomph-task-unzip.ecore http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
name="autofocus3"
label="AutoFOCUS 3 (Developer, Photon)">
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-1.8"
location="${jre.location-1.8}"
name="JRE for JavaSE-1.8">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}.</description>
</setupTask>
label="AutoFOCUS 3 (Developer, 2018-12)">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
......@@ -37,16 +31,16 @@
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="Photon Update Site stuff">
label="Eclipse 2018-12 Update Site stuff">
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.8.0,4.9.0)"/>
versionRange="[4.10.0,4.11.0)"/>
<requirement
name="org.eclipse.epp.package.modeling.feature.feature.group"
versionRange="[4.8.0,4.9.0)"/>
versionRange="[4.10.0,4.11.0)"/>
<requirement
name="org.eclipse.emf.sdk.feature.group"
versionRange="[2.14.0,2.15.0)"/>
versionRange="[2.16.0,2.17.0)"/>
<requirement
name="org.eclipse.emf.transaction.sdk.feature.group"
versionRange="[1.12.0,1.13.0)"/>
......@@ -61,30 +55,30 @@
versionRange="[1.12.0,1.13.0)"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.14.0,2.15.0)"/>
versionRange="[2.16.0,2.17.0)"/>
<repository
url="https://download.eclipse.org/releases/photon"/>
url="https://download.eclipse.org/releases/2018-12"/>
<repository
url="https://download.eclipse.org/technology/epp/packages/photon/"/>
url="https://download.eclipse.org/technology/epp/packages/2018-12/"/>
<description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
defaultValue="Photon"
defaultValue="2018-12"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="eGit jGit">
<requirement
name="org.eclipse.egit.feature.group"
versionRange="[5.0.0,5.1.0)"/>
versionRange="[5.2.0,5.3.0)"/>
<requirement
name="org.eclipse.jgit.feature.group"
versionRange="[5.0.0,5.1.0)"/>
versionRange="[5.2.0,5.3.0)"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"
versionRange="[5.0.0,5.1.0)"
versionRange="[5.2.0,5.3.0)"
filter=""/>
<repository
url="https://download.eclipse.org/egit/updates-5.0.3"/>
......@@ -110,62 +104,14 @@
url="https://download.eclipse.org/mylyn/incubator/latest/"/>
<description>Generic html-based connector for issue trackers. Used with redmine.</description>
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="SWT Bot">
<requirement
name="org.eclipse.swtbot.source.feature.group"
versionRange="[2.7.0,2.8.0)"/>
<requirement
name="org.eclipse.swtbot.eclipse.source.feature.group"
versionRange="[2.7.0,2.8.0)"/>
<requirement
name="org.eclipse.swtbot.forms.source.feature.group"
versionRange="[2.7.0,2.8.0)"/>
<repository
url="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
<description></description>
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="Orbit Dependencies">
<requirement
name="org.apache.lucene.analysis"
versionRange="[3.5.0,3.6.0)"
filter=""/>
<requirement
name="org.apache.lucene"
versionRange="[3.5.0,3.6.0)"
filter=""/>
<repository
url="https://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="Nebula Widgets">
<requirement
name="org.eclipse.nebula.feature.feature.group"
versionRange="[1.4.0,1.5.0)"/>
<repository
url="https://download.eclipse.org/nebula/releases/2.0.1"/>
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="E(fx)clipse Runtime - JavaFX support">
<requirement
name="org.eclipse.fx.target.rcp.feature.feature.group"/>
<repository
url="https://download.eclipse.org/efxclipse/runtime-released/3.3.0/site/"/>
<description>Install JavaFX runtime support for Kepler.</description>
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="E(fx)clipse IDE - JavaFX support">
<requirement
name="org.eclipse.fx.ide.feature.feature.group"
versionRange="[3.3.0,3.4.0)"/>
versionRange="[3.5.0,3.6.0)"/>
<repository
url="https://download.eclipse.org/efxclipse/updates-released/3.3.0/site/"/>
url="https://download.eclipse.org/efxclipse/updates-released/3.5.0/site"/>
<description>Install JavaFX IDE support for Kepler.</description>
</setupTask>
<setupTask
......@@ -188,6 +134,56 @@
encoding="UTF-8">
<description>Subclipse preference configuration for using SVNKit provider.</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation"
name="JavaFX SDK Installation">
<setupTask
xsi:type="setup:VariableTask"
id="jfx.installation.version"
excludedTriggers="STARTUP MANUAL"
name="jfx.installation.version"
defaultValue="11.0.2"
storageURI="scope://Installation"
label=""/>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation.win32"
name="OS-specific download">
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.win32.download"
excludedTriggers="STARTUP MANUAL"
filter="(osgi.os=win32)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_windows-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.linux.download"
excludedTriggers="STARTUP MANUAL"
filter="(osgi.os=linux)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_linux-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.macos.download"
excludedTriggers="STARTUP MANUAL"
filter="(osgi.os=macosx)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_os-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
</setupTask>
<setupTask
xsi:type="com.github.maybeec.oomph.task:unzipTask"
id="jfx.installation.unzip"
excludedTriggers="STARTUP MANUAL"
zipFile="${installation.location}/javafx-sdk.zip"
destinationDir="${installation.location}"/>
<setupTask
xsi:type="setup:PreferenceTask"
id="jfx.installation.setting"
key="/instance/org.eclipse.fx.ide.ui/javafx-sdk"
value="${installation.location/javafx-sdk}-${jfx.installation.version}/lib/"/>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
id="mylyn.repo"
......@@ -204,7 +200,20 @@
<setupTask
xsi:type="git:GitCloneTask"
id="fortiss-std-env.git.clone"
remoteURI="https://git.fortiss.org/af3/fortiss-std-env.git">
remoteURI="https://git.fortiss.org/af3/fortiss-std-env.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
......@@ -274,9 +283,21 @@
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="af3.dev.product.git.clone"
remoteURI="https://git.fortiss.org/af3/af3_dev_product.git"
id="af3.feature.git.clone"
remoteURI="https://git.fortiss.org/af3/af3-features.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
......@@ -286,7 +307,119 @@
value="true"/>
</subsections>
</configSections>
<description>Clones the fortiss AF3 (eclipse) product repository.</description>
<description>Clones the fortiss AF3 feature repository.</description>
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="af3.product.git.clone"
remoteURI="https://git.fortiss.org/af3/af3-products.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
name="origin">
<properties
key="prune"
value="true"/>
</subsections>
</configSections>
<description>Clones the fortiss AF3 product repository.</description>
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="af3.rcp.git.clone"
remoteURI="https://git.fortiss.org/af3/af3-rcp.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
name="origin">
<properties
key="prune"
value="true"/>
</subsections>
</configSections>
<description>Clones the fortiss AF3 RCP application plugin repository.</description>
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="af3.tests.git.clone"
remoteURI="https://git.fortiss.org/af3/af3-tests.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
name="origin">
<properties
key="prune"
value="true"/>
</subsections>
</configSections>
<description>Clones the fortiss AF3 JUnit tests repository.</description>
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
id="targetdefinition.git.clone"
remoteURI="https://git.fortiss.org/af3/target-definition.git"
recursive="true">
<configSections
name="fetch">
<properties
key="recurseSubmodules"
value="true"/>
</configSections>
<configSections
name="submodule">
<properties
key="recurse"
value="true"/>
</configSections>
<configSections
name="remote">
<subsections
name="origin">
<properties
key="prune"
value="true"/>
</subsections>
</configSections>
<description>Clones the fortiss AF3 target definition repository.</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
......@@ -328,7 +461,15 @@
<sourceLocator
rootFolder="${af3.git.clone.location}"/>
<sourceLocator
rootFolder="${af3.dev.product.git.clone.location}"/>
rootFolder="${af3.feature.git.clone.location}"/>
<sourceLocator
rootFolder="${af3.product.git.clone.location}"/>
<sourceLocator
rootFolder="${af3.rcp.git.clone.location}"/>
<sourceLocator
rootFolder="${af3.tests.git.clone.location}"/>
<sourceLocator
rootFolder="${targetdefinition.git.clone.location}"/>
</setupTask>
<setupTask
xsi:type="setup.workingsets:WorkingSetTask"
......@@ -547,6 +688,10 @@
</setupTask>