aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2018-02-12 09:07:08 -0500
committerJan Belle2018-02-12 09:27:12 -0500
commitb4bec069411704ea9228d2d8860a3c7a1f60856d (patch)
tree974ecff47544c802baa7251b1d8e90bb1cc58ada
parent59289a739edeaa47aed600593c0e7d364f40bff8 (diff)
downloadorg.eclipse.etrice-b4bec069411704ea9228d2d8860a3c7a1f60856d.zip
org.eclipse.etrice-b4bec069411704ea9228d2d8860a3c7a1f60856d.tar.gz
org.eclipse.etrice-b4bec069411704ea9228d2d8860a3c7a1f60856d.tar.xz
[releng] maven tycho build improvements
* increased tycho version to 1.1.0 * introduced tycho reproducible builds https://wiki.eclipse.org/Tycho/Reproducible_Version_Qualifiers * added osgi qualifier to the name of the final p2 site zip repository Change-Id: Iac3bfe135f5a730bf6d61daa8129211f2c94e95c
-rw-r--r--.gitignore3
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/pom.xml2
-rw-r--r--pom.xml9
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml31
-rw-r--r--releng/org.eclipse.etrice.site/pom.xml17
5 files changed, 47 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 9805706..07d6808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ target/
xtend-gen/
build/
.gradle/
-log/ \ No newline at end of file
+log/
+.polyglot.build.properties \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.ui.runtime/pom.xml b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
index f2484fb..e192255 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/pom.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+ <relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
</parent>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.ui.runtime</artifactId>
diff --git a/pom.xml b/pom.xml
index ef8074c..2ffb946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,20 +3,13 @@
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.2-SNAPSHOT</version>
- <relativePath>releng/org.eclipse.etrice.parent</relativePath>
- </parent>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
-
<!-- Plugins -->
<module>plugins/org.eclipse.etrice.abstractexec.behavior</module>
<module>plugins/org.eclipse.etrice.core.common</module>
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 213b883..3f0c201 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -12,14 +12,16 @@
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
<xtext.version>2.12.0</xtext.version>
- <tycho.version>1.0.0</tycho.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>
<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>
@@ -84,8 +86,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>
@@ -108,7 +131,7 @@
<outputDirectory>xtend-gen</outputDirectory>
</configuration>
</plugin>
- <!-- plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
@@ -141,7 +164,7 @@
</environment>
</environments>
</configuration>
- </plugin -->
+ </plugin>
</plugins>
</build>
</project>
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
index 1b2f90f..22c8988 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.2-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+ <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>