diff options
| author | David Williams | 2015-02-21 22:08:15 +0000 |
|---|---|---|
| committer | David Williams | 2015-02-21 22:08:15 +0000 |
| commit | dacc5d9cc39c826c51c5a5c6bbe0ba9540d53e8a (patch) | |
| tree | 185e270ad85637565107af43e66681fe33e68db1 | |
| parent | 6d9b6fe2e961adcd011740c17fcc38e7d1f7cec9 (diff) | |
| download | eclipse.platform.releng-dacc5d9cc39c826c51c5a5c6bbe0ba9540d53e8a.tar.gz eclipse.platform.releng-dacc5d9cc39c826c51c5a5c6bbe0ba9540d53e8a.tar.xz eclipse.platform.releng-dacc5d9cc39c826c51c5a5c6bbe0ba9540d53e8a.zip | |
Bug 460487 - tycho.compiler-plugin steps on compiler output, if more
than one jar in a bundle
11 files changed, 1009 insertions, 0 deletions
diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.classpath b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.classpath new file mode 100644 index 00000000..8126b8be --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.classpath @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="lib2bin" path="src-jar2"/> + <classpathentry kind="src" output="lib1bin" path="src-jar1"/> + <classpathentry kind="src" output="bin" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> +</classpath> diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.project b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.project new file mode 100644 index 00000000..e238bbb7 --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.releng.bug460487</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.settings/org.eclipse.jdt.core.prefs b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..8000cd6c --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/META-INF/MANIFEST.MF b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/META-INF/MANIFEST.MF new file mode 100644 index 00000000..3c47ebe9 --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Bug460487 +Bundle-SymbolicName: org.eclipse.releng.bug460487 +Bundle-Version: 1.0.0.qualifier +Bundle-ClassPath: lib/library1.jar, + lib/library2.jar, + . +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Main-Class: org.eclipse.releng.main.MainClass diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/build.properties b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/build.properties new file mode 100644 index 00000000..140bf0e5 --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/build.properties @@ -0,0 +1,13 @@ +bin.includes = META-INF/,\ + .,\ + lib/library1.jar,\ + lib/library2.jar +jars.compile.order = lib/library1.jar,\ + lib/library2.jar,\ + . +source.lib/library2.jar = src-jar2/ +output.lib/library2.jar = lib2bin/ +source.lib/library1.jar = src-jar1/ +output.lib/library1.jar = lib1bin/ +source.. = src/ +output.. = bin/ diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/pom.xml b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/pom.xml new file mode 100644 index 00000000..b093f563 --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/pom.xml @@ -0,0 +1,16 @@ +<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> + <parent> + <artifactId>eclipse-releng-test-parent</artifactId> + <groupId>org.eclipse</groupId> + <version>4.5.0-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.releng</groupId> + <artifactId>org.eclipse.releng.bug460487</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + <properties> + <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> + </properties> + +</project>
\ No newline at end of file diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar1/org/eclipse/releng/j1/ListManip.java b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar1/org/eclipse/releng/j1/ListManip.java new file mode 100644 index 00000000..b95a4bca --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar1/org/eclipse/releng/j1/ListManip.java @@ -0,0 +1,23 @@ +/** + * + */ +package org.eclipse.releng.j1; + +import java.util.ArrayList; + + +/** + * @author davidw + * + */ +public class ListManip extends ArrayList<String> { + + private int notUsedInt = 0; + private ArrayList notUsedArrayList = new ArrayList(); + public void testInstance() { + String item = new String("testItems1"); + add(item); + + } + +} diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar2/org/eclipse/releng/j2/UseList.java b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar2/org/eclipse/releng/j2/UseList.java new file mode 100644 index 00000000..bc1c8edd --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src-jar2/org/eclipse/releng/j2/UseList.java @@ -0,0 +1,17 @@ +package org.eclipse.releng.j2; + +import java.util.ArrayList; + +import org.eclipse.releng.j1.ListManip; + + +public class UseList { + + private boolean notUsedBoolan = false; + private ArrayList notUsedArrayList = new ArrayList(); + public UseList() { + ListManip otherInstance = new ListManip(); + otherInstance.testInstance(); + } + +} diff --git a/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src/org/eclipse/releng/main/MainClass.java b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src/org/eclipse/releng/main/MainClass.java new file mode 100644 index 00000000..bd92ddaf --- /dev/null +++ b/tests/eclipse-releng-test-parent/org.eclipse.releng.bug460487/src/org/eclipse/releng/main/MainClass.java @@ -0,0 +1,23 @@ +package org.eclipse.releng.main; +import java.util.ArrayList; +import org.eclipse.releng.j2.UseList; + + +public class MainClass { + + private ArrayList notUsedArrayList = new ArrayList(); + + public MainClass() { + + } + + public static void main(String[] args) { + new MainClass().testCode(); + } + private void testCode() { + UseList useList = new UseList(); + + System.out.println(useList.toString()); + } + +} diff --git a/tests/eclipse-releng-test-parent/pom.xml b/tests/eclipse-releng-test-parent/pom.xml new file mode 100644 index 00000000..f0640c59 --- /dev/null +++ b/tests/eclipse-releng-test-parent/pom.xml @@ -0,0 +1,826 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012, 2014 Eclipse Foundation and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Igor Fedorenko - initial implementation + Thanh Ha - improvements and maintenance + David Williams - improvements and maintenance + Lars Vogel - Bug 442042 +--> +<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> + <groupId>org.eclipse</groupId> + <artifactId>eclipse-releng-test-parent</artifactId> + <version>4.5.0-SNAPSHOT</version> + <packaging>pom</packaging> + <prerequisites> + <maven>3.1.1</maven> + </prerequisites> + <properties> + <skipTests>true</skipTests> + <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + <buildTimestamp>${maven.build.timestamp}</buildTimestamp> + <buildType>I</buildType> + <buildId>${buildType}${buildTimestamp}</buildId> + <!-- + releaseName should match the yearly "release train" name. + For example, "Luna", "Luna SR1", "Luna SR2", etc. + It will show up in "about box", in parenthesis, after version number, + such as Version: 4.4.0 (Luna), for main features. + See bug 328139. + --> + <releaseName>Mars</releaseName> + <!-- + The releaseNumbers below, for SDK and Platform, might be + thought of as the "marketing number" or "branding number", + and in fact are used in the branding bundle of the corresponding products. + In practice, the SDK number and Platform number are always the same, + though in theory they would not always have to be ... so we'll use + separate numbers. Also in practice, they are almost always the same as + or nearly the same as the "product feature" numbers, but for example, for + the initial release, some prefer we not use the trailing zero, but instead + merely "4.5, instead of 4.5.0". And, hypothetically, there might be a time + in the future when the platform for a new release was "merely service", + but we'd still want the "marketing number" to be increased to reflect + "a new yearly release". + --> + <releaseNumberSDK>4.5</releaseNumberSDK> + <releaseNumberPlatform>4.5</releaseNumberPlatform> + + + <tycho.version>0.21.0</tycho.version> + <tycho-extras.version>0.21.0</tycho-extras.version> + <cbi-plugins.version>1.1.1</cbi-plugins.version> + <!-- + The tycho-eclipserun-plugin will create its instance of Eclipse from this + 'eclipiserun-repo' repository, such as for computing .api-descriptions. + --> + <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5-201501291830/</eclipserun-repo> + + <comparator.repo>http://download.eclipse.org/eclipse/updates/4.5-I-builds</comparator.repo> + + <!-- + NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file. + We use it (the EMF repo and ECF repo) not only for resolving pre-reqs during the build, but also in 'repository' POM for mirroring + a copy of the EMF features and ECF features into our own repository. This is required since we merely "require" EMF (not "include" it). + And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable. + --> + <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/base/S201501230347/</emf-repo.url> + + <ecf-repo.url>http://download.eclipse.org/rt/ecf/3.9.2/site.p2/</ecf-repo.url> + + <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url> + <cbi-jdt-version>3.11.0.v20150118-1315</cbi-jdt-version> + + <!-- + This jetty-version is used by the help system in building the JSPs, + and should change when ever our "shipped" version of Jetty changes. + --> + <jetty-version>9.2.5.v20141112</jetty-version> + + <!-- + Production bundles are produced by ignoring the compiler warnings specified + by ${code.ignoredWarnings} (see further down). + Good citizens don't override those default settings for their production bundles. + --> + <code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems</code.ignoredWarnings> + + <!-- + Test bundles may override the list of ignored warnings by setting the <code.ignoredWarnings> property to ${tests.ignoredWarnings}: + <properties> + <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings> + </properties> + Good citizens use those default settings for their test bundles. + --> + <tests.ignoredWarnings>-warn:-deprecation,raw,unchecked,discouraged</tests.ignoredWarnings> + + <eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url> + <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url> + <!-- this eclipse-p2-repo.url is specifically for the build individual bundles profile. --> + <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.5-N-builds</eclipse-p2-repo.url> + + <!-- + If configuration is not specified at all, in signing plugin, the default + is 'false' (do not exclude inner jars, that is inner jars are signed). + --> + <defaultSigning-excludeInnerJars>false</defaultSigning-excludeInnerJars> + + <!-- + Valid options: error, warning, and ignore + jgit.dirtyWorkingTree checking was added as of Tycho 0.19.0 + see: https://bugs.eclipse.org/419030 + --> + <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> + + </properties> + + <distributionManagement> + <repository> + <id>repo.eclipse.org</id> + <name>Eclipse Repository - Releases</name> + <url>https://repo.eclipse.org/content/repositories/eclipse-releases/</url> + </repository> + <snapshotRepository> + <id>repo.eclipse.org</id> + <name>Eclipse Repository - Snapshots</name> + <url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</url> + </snapshotRepository> + </distributionManagement> + <pluginRepositories> + + <pluginRepository> + <id>tycho</id> + <url>${tycho-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>cbi-jdt</id> + <url>${cbi-jdt-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>cbi-snapshots</id> + <url>${cbi-snapshots-repo.url}</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>eclipse</id> + <url>${eclipse-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-cbi-plugin</artifactId> + <version>${cbi-plugins.version}</version> + <executions> + <execution> + <goals> + <goal>generate-api-build-xml</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757 + <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints> + + <target> + <artifact> + <groupId>org.eclipse</groupId> + <artifactId>eclipse-sdk-prereqs</artifactId> + <version>4.5.0-SNAPSHOT</version> + </artifact> + </target> + --> + <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>linux</os> + <ws>gtk</ws> + <arch>ppc</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>ppc64</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>ppc64le</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>s390</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>s390x</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> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>solaris</os> + <ws>gtk</ws> + <arch>sparc</arch> + </environment> + <environment> + <os>solaris</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>hpux</os> + <ws>gtk</ws> + <arch>ia64</arch> + </environment> + <environment> + <os>aix</os> + <ws>gtk</ws> + <arch>ppc</arch> + </environment> + <environment> + <os>aix</os> + <ws>gtk</ws> + <arch>ppc64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + </configuration> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter-resources</id> + <goals> + <goal>resources</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <outputDirectory>${project.build.directory}/resources</outputDirectory> + <escapeString>\</escapeString> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho.version}</version> + <dependencies> + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> + <version>${cbi-jdt-version}</version> + </dependency> + </dependencies> + <configuration> + <compilerArgument>${code.ignoredWarnings}</compilerArgument> + <compilerArguments> + <verbose /> + <inlineJSR /> + <enableJavadoc /> + <encoding>${project.build.sourceEncoding}</encoding> + <proceedOnError /> + <log>${project.build.directory}/@dot.xml</log> + </compilerArguments> + <showWarnings>true</showWarnings> + <excludeResources> + <exclude>**/package.html</exclude> + </excludeResources> + </configuration> + </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-extras.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> + <format>'v'yyyyMMdd-HHmm</format> + <!-- + <timestampProvider>jgit</timestampProvider> + <jgit.ignore> + pom.xml + </jgit.ignore> + <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree> + + <sourceReferences> + <generate>true</generate> + </sourceReferences> + --> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + <additionalFileSets> + <fileSet> + <directory>${project.build.directory}</directory> + <includes> + <include>.api_description</include> + </includes> + </fileSet> + </additionalFileSets> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <distinctSourceRoots>true</distinctSourceRoots> + <strictSrcIncludes>false</strictSrcIncludes> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-director-plugin</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tycho-extras.version}</version> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + <reuseBrandingPlugin>false</reuseBrandingPlugin> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <baselineMode>warn</baselineMode> + <baselineReplace>all</baselineReplace> + <baselineRepositories> + <repository> + <url>${comparator.repo}</url> + </repository> + </baselineRepositories> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>build-individual-bundles</id> + <repositories> + <repository> + <id>eclipse-p2-repo</id> + <url>${eclipse-p2-repo.url}</url> + <layout>p2</layout> + </repository> + </repositories> + </profile> + <profile> + <id>eclipse-sign</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <includePackedArtifacts>false</includePackedArtifacts> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200a-plugin</artifactId> + <version>${tycho-extras.version}</version> + <executions> + <execution> + <id>pack200-normalize</id> + <goals> + <goal>normalize</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-jarsigner-plugin</artifactId> + <version>${cbi-plugins.version}</version> + <executions> + <execution> + <id>sign</id> + <goals> + <goal>sign</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + <configuration> + <excludeInnerJars>${defaultSigning-excludeInnerJars}</excludeInnerJars> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>${tycho-extras.version}</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <executions> + <execution> + <id>p2-metadata</id> + <goals> + <goal>p2-metadata</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>eclipse-pack</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <includePackedArtifacts>false</includePackedArtifacts> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200a-plugin</artifactId> + <version>${tycho-extras.version}</version> + <executions> + <execution> + <id>pack200-normalize</id> + <goals> + <goal>normalize</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>${tycho-extras.version}</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <executions> + <execution> + <id>p2-metadata</id> + <goals> + <goal>p2-metadata</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>bree-libs</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <!-- + this tells Tycho to use JRE libraries that match bundle runtime execution environment + http://wiki.eclipse.org/Tycho/Release_Notes/0.14 + TODO provide CBI-specific wiki that explains how to setup BREE libraries and toolchain.xml + --> + <useJDK>BREE</useJDK> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + <profile> + <id>partial-build</id> + <activation> + <property> + <name>eclipse-sdk-repo.url</name> + </property> + </activation> + <repositories> + <repository> + <id>eclipse-sdk-repo</id> + <url>${eclipse-sdk-repo.url}</url> + <layout>p2</layout> + </repository> + </repositories> + </profile> + <profile> + <id>default-toolsjar</id> + <activation> + <activeByDefault>true</activeByDefault> + <file> + <exists>${java.home}/../lib/tools.jar</exists> + </file> + </activation> + <properties> + <toolsjar>${java.home}/../lib/tools.jar</toolsjar> + </properties> + </profile> + <profile> + <id>missing-toolsjar</id> + <activation> + <activeByDefault>false</activeByDefault> + <file> + <exists>${java.home}/../Classes/classes.jar</exists> + </file> + </activation> + <properties> + <toolsjar>${java.home}/../Classes/classes.jar</toolsjar> + </properties> + </profile> + <profile> + <id>api-generation</id> + <activation> + <property> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <!-- this is actually present in any 0.14+ version --> + <version>${tycho-extras.version}</version> + <configuration> + <repositories> + <repository> + <id>eclipse</id> + <layout>p2</layout> + <url>${eclipserun-repo}</url> + </repository> + </repositories> + <!-- this is to fix some lucene 3.x compatibility issue --> + <argLine>-Dhelp.lucene.tokenizer=standard</argLine> + <!-- actuall indexer call --> + <appArgLine>-data target/apibuild-workspace -application org.eclipse.ant.core.antRunner -buildfile target/.apibuild.xml</appArgLine> + <dependencies> + <!-- list of bundles that we need --> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.api.tools</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.build</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.equinox.launcher</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.osgi.compatibility.state</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <!-- + This task is to save properties we are explicitly interested in using later, + such as when displaying in other reports or php pages. It depends on having + the "template" file be part of the 'saveproperties' directory. Its only purpose + is to "fill in" the property values named in that file. + --> + <resource> + <directory>saveproperties</directory> + <filtering>true</filtering> + </resource> + </resources> + + </build> + </profile> + + <profile> + <id>update-branding-plugins-about.mappings</id> + <activation> + <file> + <exists>${basedir}/about.mappings</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>process-about.mappings</id> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>about.mappings</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + <goals> + <goal>copy-resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <additionalFileSets> + <fileSet> + <directory>${project.build.directory}</directory> + <includes> + <include>about.mappings</include> + </includes> + </fileSet> + </additionalFileSets> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <modules> + + <module>org.eclipse.releng.bug460487</module> + + + </modules> +</project> diff --git a/tests/eclipse-releng-test-parent/saveproperties/mavenproperties.properties b/tests/eclipse-releng-test-parent/saveproperties/mavenproperties.properties new file mode 100644 index 00000000..0e77f373 --- /dev/null +++ b/tests/eclipse-releng-test-parent/saveproperties/mavenproperties.properties @@ -0,0 +1,34 @@ +# typical properties we may need elsewhere, such as +# to display in reports or PHP pages + +tycho-extras.version=${tycho-extras.version} +tycho-repo.url=${tycho-repo.url} +tycho.debug.artifactcomparator=${tycho.debug.artifactcomparator} +tycho.localArtifacts=${tycho.localArtifacts} +tycho.version=${tycho.version} +cbi-jdt-repo.url=${cbi-jdt-repo.url} +cbi-jdt-version=${cbi-jdt-version} +cbi-plugins.version=${cbi-plugins.version} + +java.class.path=${java.class.path} +java.class.version=${java.class.version} +java.endorsed.dirs=${java.endorsed.dirs} +java.ext.dirs=${java.ext.dirs} +java.home=${java.home} +java.io.tmpdir=${java.io.tmpdir} +java.library.path=${java.library.path} +java.runtime.name=${java.runtime.name} +java.runtime.version=${java.runtime.version} +java.specification.name=${java.specification.name} +java.version=${java.version} + +maven.home=${maven.home} +maven.repo.local=${maven.repo.local} + +comparator.repo=${comparator.repo} + +eclipse-p2-repo.url=${eclipse-p2-repo.url} + +eclipse-repo.url=${eclipse-repo.url} + +sun.java.command=${sun.java.command} |
