Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2017-11-28 16:43:20 -0500
committernickboldt2017-11-28 16:45:29 -0500
commit217ad8abd666763418292674206b291f21727964 (patch)
treea089d763b498c5f7629d931d7428a7189c043aab
parentc25db554608f6361864a87d70c36e01e85f65958 (diff)
downloadwebtools.dali-217ad8abd666763418292674206b291f21727964.tar.gz
webtools.dali-217ad8abd666763418292674206b291f21727964.tar.xz
webtools.dali-217ad8abd666763418292674206b291f21727964.zip
Bug 480380 - disable the three tests that don't work with Tycho 1.0 and which are NOT currently run as part of the wtp releng.aggregator build
add missing repository refs to root pom (test dali gerrit runner works) Signed-off-by: nickboldt <nboldt@redhat.com>
-rw-r--r--pom.xml68
1 files changed, 51 insertions, 17 deletions
diff --git a/pom.xml b/pom.xml
index 8430c8b1c8..b3ffe26901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,22 +28,54 @@
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/dali/webtools.dali.git</tycho.scmUrl>
+ <tycho.version>1.0.0</tycho.version>
+ <tycho-extras.version>1.0.0</tycho-extras.version>
</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>
-
+ <repositories>
+ <repository>
+ <id>webtools-common-site</id>
+ <layout>p2</layout>
+ <url>${webtools-common-site}</url>
+ </repository>
+ <repository>
+ <id>webtools-servertools-site</id>
+ <layout>p2</layout>
+ <url>${webtools-servertools-site}</url>
+ </repository>
+ <repository>
+ <id>webtools-jsdt-site</id>
+ <layout>p2</layout>
+ <url>${webtools-jsdt-site}</url>
+ </repository>
+
+ <!-- To reference parent pom -->
+ <repository>
+ <id>Webtools Repository - Releases</id>
+ <name>Webtools Repository - Releases</name>
+ <url>https://repo.eclipse.org/content/repositories/webtools-releases/</url>
+ </repository>
+ <repository>
+ <id>Webtools Repository - Snapshots</id>
+ <name>Webtools Repository - Snapshots</name>
+ <url>https://repo.eclipse.org/content/repositories/webtools-snapshots/</url>
+ </repository>
+ </repositories>
+
+ <!-- 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>
@@ -89,8 +121,9 @@
<module>jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui</module>
<module>jaxb/plugins/org.eclipse.jpt.jaxb.ui</module>
- <module>jaxb/tests/org.eclipse.jpt.jaxb.core.tests</module>
- <module>jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests</module>
+ <!-- disable tests that don't currently work and are not currently RUN as part of the releng.aggregator build -->
+ <!-- <module>jaxb/tests/org.eclipse.jpt.jaxb.core.tests</module> -->
+ <!-- <module>jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests</module> -->
<!-- jpa -->
<module>jpa/features/org.eclipse.jpt.jpa.eclipselink.feature</module>
@@ -114,7 +147,8 @@
<module>jpa/plugins/org.eclipse.jpt.jpa.gen</module>
<module>jpa/plugins/org.eclipse.jpt.jpa.ui</module>
- <module>jpa/tests/org.eclipse.jpt.jpa.core.tests</module>
+ <!-- disable tests that don't currently work and are not currently RUN as part of the releng.aggregator build -->
+ <!-- <module>jpa/tests/org.eclipse.jpt.jpa.core.tests</module> -->
<module>jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource</module>
<module>jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests</module>

Back to the top