Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • af3/af3-products
1 result
Show changes
Commits on Source (4)
downstream-job:
variables:
BUILD_BRANCH: "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
only:
- merge_requests
trigger:
project: af3/maven-releng
strategy: depend
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
<setEntry value="org.eclipse.xtext.logging@default:false"/> <setEntry value="org.eclipse.xtext.logging@default:false"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.hamcrest.library@default:default"/> <setEntry value="org.hamcrest.library@default:default"/>
<setEntry value="org.json@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.openjfx.base@default:default"/> <setEntry value="org.openjfx.base@default:default"/>
<setEntry value="org.openjfx.controls@default:default"/> <setEntry value="org.openjfx.controls@default:default"/>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="AutoFOCUS 3 - &quot;Phoenix&quot; 2.18" uid="org.fortiss.af3.phoenix.product" id="org.fortiss.af3.rcp.application.product" application="org.fortiss.af3.rcp.application.af3app" version="2.18.0.qualifier" useFeatures="true" includeLaunchers="true"> <product name="AutoFOCUS 3 - &quot;Phoenix&quot; 2.19" uid="org.fortiss.af3.phoenix.product" id="org.fortiss.af3.rcp.application.product" application="org.fortiss.af3.rcp.application.af3app" version="2.19.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo> <aboutInfo>
<image path="icons/about.png"/> <image path="icons/about.png"/>
<text> <text>
AutoFOCUS 3 - &quot;Phoenix&quot; AutoFOCUS 3 - &quot;Phoenix&quot;
Version: 2.18.0 Version: 2.19.0
Copyright 2011-2018 fortiss GmbH Copyright 2011-2018 fortiss GmbH
...@@ -82,7 +82,7 @@ limitations under the License. ...@@ -82,7 +82,7 @@ limitations under the License.
</plugins> </plugins>
<features> <features>
<feature id="org.fortiss.af3.phoenix.feature" version="2.18.0.qualifier"/> <feature id="org.fortiss.af3.phoenix.feature" version="2.19.0.qualifier"/>
<feature id="org.eclipse.rcp"/> <feature id="org.eclipse.rcp"/>
<feature id="org.eclipse.fx.runtime.feature"/> <feature id="org.eclipse.fx.runtime.feature"/>
<feature id="org.openjfx.feature.basic"/> <feature id="org.openjfx.feature.basic"/>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>AF3 Phoenix 2.14 Product</name> <name>AF3 Phoenix 2.14 Product</name>
<version>2.18.0-SNAPSHOT</version> <version>2.19.0-SNAPSHOT</version>
<artifactId>org.fortiss.af3.phoenix.product</artifactId> <artifactId>org.fortiss.af3.phoenix.product</artifactId>
<groupId>org.fortiss.af3.phoenix.products</groupId> <groupId>org.fortiss.af3.phoenix.products</groupId>
<packaging>eclipse-repository</packaging> <packaging>eclipse-repository</packaging>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<!-- MacOS build --> <!-- MacOS build -->
<echo message="Fixing MacOS build..."/> <echo message="Fixing MacOS build..."/>
<copy todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/"> <copy todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/">
<fileset dir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/plugins/com.microsoft.z3_2.18.0.${buildQualifier}/lib/x64/"> <fileset dir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/plugins/com.microsoft.z3_2.19.0.${buildQualifier}/lib/x64/">
<include name="*.dylib"/> <include name="*.dylib"/>
</fileset> </fileset>
</copy> </copy>
......