Updated Maven Tycho build
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 3eb16f1..cbfcda0 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@ <extension> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-build</artifactId> - <version>2.7.1</version> + <version>3.0.3</version> </extension> </extensions> \ No newline at end of file
diff --git a/pom.xml b/pom.xml index 5ccc4b6..f593563 100644 --- a/pom.xml +++ b/pom.xml
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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> @@ -13,51 +14,55 @@ <name>APP4MC Migration Component</name> <description>APP4MC AMALTHEA Model migration</description> <url>https://projects.eclipse.org/projects/automotive.app4mc</url> - - <licenses> - <license> - <name>Eclipse Public License - v 2.0</name> - <url>https://www.eclipse.org/legal/epl-2.0/</url> - </license> - </licenses> + + <licenses> + <license> + <name>Eclipse Public License - v 2.0</name> + <url>https://www.eclipse.org/legal/epl-2.0/</url> + </license> + </licenses> <developers> - <developer> + <developer> <name>Harald Mackamul</name> <email>harald.mackamul@de.bosch.com</email> </developer> - <developer> + <developer> <name>Dirk Fauth</name> <email>dirk.fauth@de.bosch.com</email> </developer> - <developer> + <developer> <name>Zakir Hussain Meer</name> <email>ZakirHussain.Meer@de.bosch.com</email> </developer> </developers> - - <scm> - <connection>scm:git:git://git.eclipse.org/gitroot/app4mc/org.eclipse.app4mc.addon.migration.git</connection> - <developerConnection>scm:git:https://git.eclipse.org/r/app4mc/org.eclipse.app4mc.addon.migration.git</developerConnection> - <url>https://git.eclipse.org/c/app4mc/org.eclipse.app4mc.addon.migration.git/</url> - </scm> + + <scm> + <connection>scm:git:git://git.eclipse.org/gitroot/app4mc/org.eclipse.app4mc.addon.migration.git</connection> + <developerConnection>scm:git:https://git.eclipse.org/r/app4mc/org.eclipse.app4mc.addon.migration.git</developerConnection> + <url>https://git.eclipse.org/c/app4mc/org.eclipse.app4mc.addon.migration.git/</url> + </scm> <properties> <app4mc.version>${project.version}</app4mc.version> <app4mc.baseline>3.0.0</app4mc.baseline> - <tycho.version>2.7.5</tycho.version> + <!-- must be same version as in ./.mvn/extensions.xml --> + <tycho.version>3.0.3</tycho.version> + + <java.version>11</java.version> + + <jarsigner-version>1.3.1</jarsigner-version> <build-helper.version>1.9.1</build-helper.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMdd-HHmmss</maven.build.timestamp.format> <jacoco.version>0.8.5</jacoco.version> <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../releng/org.eclipse.app4mc.converters.p2repo/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> <sonar.surefire.reportsPath>../../tests/${project.artifactId}.tests/target/surefire-reports/</sonar.surefire.reportsPath> - <sonar.java.source>8</sonar.java.source> + <sonar.java.source>${java.version}</sonar.java.source> <!-- coverage exclusions --> <sonar.coverage.exclusions>**/*.tests/**/*.java</sonar.coverage.exclusions> <!-- duplication exclusion --> @@ -91,7 +96,7 @@ <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.3.1</version> + <version>${jarsigner-version}</version> <executions> <execution> <id>sign</id> @@ -110,7 +115,7 @@ <dependencies> <dependency> - <groupId>org.eclipse.tycho.extras</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-buildtimestamp-jgit</artifactId> <version>${tycho.version}</version> </dependency> @@ -143,11 +148,11 @@ <artifactId>jacoco-maven-plugin</artifactId> <version>${jacoco.version}</version> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> </plugin> </plugins> </pluginManagement> @@ -155,6 +160,25 @@ <plugins> <plugin> <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-compiler-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <verbose>true</verbose> + </configuration> + </plugin> + + <plugin> + <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho.version}</version> @@ -185,7 +209,7 @@ </artifact> </target> <targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource> - + <dependency-resolution> <extraRequirements> <requirement> @@ -200,14 +224,6 @@ <plugin> <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-source-plugin</artifactId> <version>${tycho.version}</version> @@ -261,7 +277,7 @@ </plugins> </build> </profile> - + <profile> <id>sign</id> <build> @@ -270,7 +286,7 @@ <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.3.1</version> + <version>${jarsigner-version}</version> <executions> <execution> <id>sign</id> @@ -285,113 +301,113 @@ </plugins> </build> </profile> - - <profile> - <id>skip-deploy-eclipse-feature</id> - <activation> - <file> - <exists>feature.xml</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>skip-deploy-eclipse-test</id> - <activation> - <file> - <exists>no_deploy.txt</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>skip-deploy-eclipse-target</id> - <activation> - <file> - <exists>org.eclipse.app4mc.converters.target.target</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>skip-deploy-eclipse-product</id> - <activation> - <file> - <exists>headless.product</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>skip-deploy-eclipse-updatesite</id> - <activation> - <file> - <exists>category.xml</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>skip-deploy-connector-pom</id> - <activation> - <file> - <exists>.polyglot.pom.tycho</exists> - </file> - </activation> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - </profile> - <profile> - <id>maven-publish</id> - - <distributionManagement> - <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>ossrh</id> - <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> - </repository> - </distributionManagement> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - <configuration> - <gpgArguments> - <arg>--pinentry-mode</arg> - <arg>loopback</arg> - </gpgArguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <id>skip-deploy-eclipse-feature</id> + <activation> + <file> + <exists>feature.xml</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + <profile> + <id>skip-deploy-eclipse-test</id> + <activation> + <file> + <exists>no_deploy.txt</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + <profile> + <id>skip-deploy-eclipse-target</id> + <activation> + <file> + <exists>org.eclipse.app4mc.converters.target.target</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + <profile> + <id>skip-deploy-eclipse-product</id> + <activation> + <file> + <exists>headless.product</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + <profile> + <id>skip-deploy-eclipse-updatesite</id> + <activation> + <file> + <exists>category.xml</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + <profile> + <id>skip-deploy-connector-pom</id> + <activation> + <file> + <exists>.polyglot.pom.tycho</exists> + </file> + </activation> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </profile> + + + <profile> + <id>maven-publish</id> + + <distributionManagement> + <snapshotRepository> + <id>ossrh</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + <repository> + <id>ossrh</id> + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> + </repository> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + <configuration> + <gpgArguments> + <arg>--pinentry-mode</arg> + <arg>loopback</arg> + </gpgArguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> </project> \ No newline at end of file
diff --git a/releng/org.eclipse.app4mc.converters.product/pom.xml b/releng/org.eclipse.app4mc.converters.product/pom.xml index f35971c..06e1fe1 100644 --- a/releng/org.eclipse.app4mc.converters.product/pom.xml +++ b/releng/org.eclipse.app4mc.converters.product/pom.xml
@@ -47,7 +47,7 @@ <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-export-maven-plugin</artifactId> - <version>4.3.1</version> + <version>6.4.0</version> <configuration> <failOnChanges>false</failOnChanges> <bndruns>