Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorJuergen Haug2018-06-18 04:25:01 -0400
committerJuergen Haug2018-06-18 04:25:01 -0400
commit842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch)
treee7ee889793d4cf5ec16419fbdc8a73889154361a /releng
parent29873f1151bb915cf3044f21deca9c756d3f95e0 (diff)
parent3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff)
downloadorg.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts: plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF pom.xml releng/org.eclipse.etrice.parent/pom.xml tests/org.eclipse.etrice.generator.c.tests/.gitignore tests/org.eclipse.etrice.generator.cpp.tests/.gitignore tests/org.eclipse.etrice.generator.java.tests/.gitignore Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml36
-rw-r--r--releng/org.eclipse.etrice.site/category.xml4
-rw-r--r--releng/org.eclipse.etrice.site/pom.xml19
3 files changed, 48 insertions, 11 deletions
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 209632eb9..46d4c9d46 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -5,14 +5,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
-
- <xtext.version>2.13.0</xtext.version>
- <tycho.version>1.0.0</tycho.version>
+ <xtext.version>2.12.0</xtext.version>
+ <tycho.version>1.1.0</tycho.version>
<cbi.version>1.1.4</cbi.version>
<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
@@ -20,7 +19,9 @@
<license.url>http://download.eclipse.org/cbi/updates/license</license.url>
<orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
<cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url>
+ <etrice.url>http://download.eclipse.org/etrice/updates/nightly</etrice.url>
+ <build.alias></build.alias>
<build.type>N</build.type>
</properties>
@@ -90,8 +91,29 @@
<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.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
- <format>'${build.type}'yyyyMMddHHmm</format>
+ <format>'${build.alias}${build.type}'yyyyMMddHHmm</format>
+ <timestampProvider>jgit</timestampProvider>
+ <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <baselineRepositories>
+ <repository>
+ <url>${etrice.url}</url>
+ </repository>
+ </baselineRepositories>
</configuration>
</plugin>
<plugin>
@@ -114,7 +136,7 @@
<outputDirectory>xtend-gen</outputDirectory>
</configuration>
</plugin>
- <!-- plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
@@ -147,7 +169,7 @@
</environment>
</environments>
</configuration>
- </plugin -->
+ </plugin>
</plugins>
</build>
</project>
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 134e911aa..e1c064804 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.eclipse.etrice.feature" version="1.1.1.qualifier">
+ <feature id="org.eclipse.etrice.feature" version="1.1.2.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
- <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier">
+ <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.2.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
<category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
index 078dc6cb5..22c89886a 100644
--- a/releng/org.eclipse.etrice.site/pom.xml
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -2,13 +2,28 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+ <version>1.1.2-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
</parent>
+
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.site</artifactId>
<packaging>eclipse-repository</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <finalName>${project.name}-${qualifiedVersion}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>

Back to the top