1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00

fix indents, remove win32 32-bit from TP definition; use 4.8milestones instead of 4.8M4;

add dstore_core.jar to plugins/org.eclipse.dstore.core/.gitignore

Signed-off-by: nickboldt <nboldt@redhat.com>
This commit is contained in:
nickboldt 2018-01-12 16:03:41 -05:00
parent d44bade9a7
commit e928812a57
2 changed files with 316 additions and 322 deletions

637
pom.xml
View file

@ -4,328 +4,321 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.tm</groupId>
<artifactId>tm-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Target Management Parent</name>
<groupId>org.eclipse.tm</groupId>
<artifactId>tm-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Target Management Parent</name>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>1.0.0</tycho-extras-version>
<maven-resources-version>2.6</maven-resources-version>
<!-- TODO: switch to 4.8 after June 27, 2018 -->
<sdk-version>4.8milestones</sdk-version>
<!-- Set up the default target platform to build against -->
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
<platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository</orbit-site>
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
<terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
</properties>
<repositories>
<repository>
<id>license-feature</id>
<url>${license-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>platform</id>
<url>${platform-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>orbit</id>
<url>${orbit-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>cdt</id>
<url>${cdt-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>terminal</id>
<url>${terminal-site}</url>
<layout>p2</layout>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>http://oss.sonatype.org/content/repositories/public</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>cbi</id>
<url>http://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
<pluginRepository>
<id>cbi-snapshots</id>
<url>http://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
<pluginManagement>
<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>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
</environments>
<resolver>p2</resolver>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<includePackedArtifacts>true</includePackedArtifacts>
<pomDependencies>consider</pomDependencies>
<filters>
<filter>
<type>eclipse-plugin</type>
<id>org.apache.commons.net</id>
<restrictTo>
<versionRange>[3.2,3.3)</versionRange>
</restrictTo>
</filter>
<filter>
<type>eclipse-plugin</type>
<id>org.apache.commons.net.source</id>
<restrictTo>
<versionRange>[3.2,3.3)</versionRange>
</restrictTo>
</filter>
</filters>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<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>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras-version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
<sourceReferences>
<generate>true</generate>
</sourceReferences>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<finalName>${project.artifactId}</finalName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>${gmaven-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<effort>Max</effort>
<threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
<failOnError>false</failOnError>
<excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-version}</version>
</plugin>
<!-- Pack200 and Signing -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
<phase>verify</phase>
<goals>
<goal>normalize</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>${eclipse-jarsigner-version}</version>
<executions>
<execution>
<id>sign</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<phase>verify</phase>
<goals>
<goal>pack</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
<!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<!-- Signing appears to mess with the baseline repository logic.
Disable the baseline repository until we've figured out what is going on. -->
<!--
<configuration>
<baselineRepositories>
<repository>
<url>http://download.eclipse.org/tools/tm/builds/${tm-stream}/nightly</url>
</repository>
</baselineRepositories>
</configuration>
-->
<executions>
<execution>
<id>p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>1.0.0</tycho-extras-version>
<maven-resources-version>2.6</maven-resources-version>
<sdk-version>4.8milestones/S-4.8M4-201712062000</sdk-version>
<!-- Set up the default target platform to build against -->
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
<platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository</orbit-site>
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
<terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
</properties>
<repositories>
<repository>
<id>license-feature</id>
<url>${license-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>platform</id>
<url>${platform-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>orbit</id>
<url>${orbit-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>cdt</id>
<url>${cdt-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>terminal</id>
<url>${terminal-site}</url>
<layout>p2</layout>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>http://oss.sonatype.org/content/repositories/public</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>cbi</id>
<url>http://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
<pluginRepository>
<id>cbi-snapshots</id>
<url>http://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
<pluginManagement>
<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>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
</environments>
<resolver>p2</resolver>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<includePackedArtifacts>true</includePackedArtifacts>
<pomDependencies>consider</pomDependencies>
<filters>
<filter>
<type>eclipse-plugin</type>
<id>org.apache.commons.net</id>
<restrictTo>
<versionRange>[3.2,3.3)</versionRange>
</restrictTo>
</filter>
<filter>
<type>eclipse-plugin</type>
<id>org.apache.commons.net.source</id>
<restrictTo>
<versionRange>[3.2,3.3)</versionRange>
</restrictTo>
</filter>
</filters>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<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>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras-version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
<sourceReferences>
<generate>true</generate>
</sourceReferences>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<finalName>${project.artifactId}</finalName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>${gmaven-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<effort>Max</effort>
<threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
<failOnError>false</failOnError>
<excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-version}</version>
</plugin>
<!-- Pack200 and Signing -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
<phase>verify</phase>
<goals>
<goal>normalize</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>${eclipse-jarsigner-version}</version>
<executions>
<execution>
<id>sign</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<phase>verify</phase>
<goals>
<goal>pack</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
<!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<!-- Signing appears to mess with the baseline repository logic.
Disable the baseline repository until we've figured out what is going on. -->
<!--
<configuration>
<baselineRepositories>
<repository>
<url>http://download.eclipse.org/tools/tm/builds/${tm-stream}/nightly</url>
</repository>
</baselineRepositories>
</configuration>
-->
<executions>
<execution>
<id>p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<!-- RSE features and plug-ins -->
<module>rse</module>
<!-- Windows CE subsystem and support for RSE -->
<module>wince</module>
</modules>
<modules>
<!-- RSE features and plug-ins -->
<module>rse</module>
<!-- Windows CE subsystem and support for RSE -->
<module>wince</module>
</modules>
</project>

View file

@ -0,0 +1 @@
dstore_core.jar