Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2017-11-20 14:26:02 -0500
committerBrian Vosburgh2017-11-20 14:26:02 -0500
commitc25db554608f6361864a87d70c36e01e85f65958 (patch)
tree8707236289998c9ecf8fb6701929861daee7c881
parente6e0c38e0fccb510c0bbe2d477d289e63134bbb0 (diff)
downloadwebtools.dali-c25db554608f6361864a87d70c36e01e85f65958.tar.gz
webtools.dali-c25db554608f6361864a87d70c36e01e85f65958.tar.xz
webtools.dali-c25db554608f6361864a87d70c36e01e85f65958.zip
[526334] support building with Tycho 1.0
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml3
-rw-r--r--pom.xml14
2 files changed, 14 insertions, 3 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
index bfe0f91a23..e3da57e7d5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
@@ -80,9 +80,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
- <configuration>
- <skipTests>${skipWithIssues}</skipTests>
- </configuration>
<executions>
<execution>
<id>default-test</id>
diff --git a/pom.xml b/pom.xml
index 5fa1490b4b..8430c8b1c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,20 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/dali/webtools.dali.git</tycho.scmUrl>
</properties>
+ <!-- Bug 526334 - ignore vestigial project settings which appear in Eclipse but are ignored by Tycho, like API access restrictions -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <useProjectSettings>false</useProjectSettings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<!-- assembly -->
<module>assembly/features/org.eclipse.jpt.assembly.feature</module>

Back to the top