Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-04-24 08:35:53 -0400
committerjmisinco2015-04-24 08:35:53 -0400
commit8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b (patch)
treeffe0acb742f047e5cecc78247a361efa0cd03e8a /plugins/org.eclipse.osee.x.server.integration.tests
parente336a127c7645b5e1f076336d35ebbe494208fef (diff)
downloadorg.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.gz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.xz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.zip
feature: Luna, Java8, Tycho 0.22
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/pom.xml61
2 files changed, 57 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
index 84142d4b75..66e314baa2 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: OSEE X Server Integration Tests
Bundle-SymbolicName: org.eclipse.osee.x.server.integration.tests
Bundle-Version: 0.22.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
Import-Package: javax.ws.rs.core;version="2.0.0",
org.apache.commons.lang.math,
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
index bc6044a78e..ed33513707 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
@@ -33,6 +33,52 @@
<redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.orcs.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.x.core.external.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.x.core.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.equinox.cm</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.equinox.ds</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.osee.orcs.db.mock</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -53,7 +99,8 @@
<version>${tycho-version}</version>
<configuration>
<debugPort>${int-test-debug-port}</debugPort>
- <!-- <systemProperties combine.children="append"> <equinox.ds.debug>true</equinox.ds.debug> </systemProperties> -->
+ <!-- <systemProperties combine.children="append"> <equinox.ds.debug>true</equinox.ds.debug>
+ </systemProperties> -->
</configuration>
</plugin>
</plugins>
@@ -114,12 +161,14 @@
</classpath>
</taskdef>
- <property name="xserver-project" value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
+ <property name="xserver-project"
+ value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
<property name="xserver-home" value="${xserver-project}/target/server" />
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
<property name="xserver-authentication" value="demo" />
- <property name="xserver-data" value="${project.build.directory}/server-data" />
+ <property name="xserver-data"
+ value="${project.build.directory}/server-data" />
<property name="xserver-log-config" value="${project.basedir}/logback-test.xml" />
<property name="xserver-use-demo-data" value="true" />
@@ -136,7 +185,8 @@
<property name="xserver-log-output" value="${xserver-data}/server-output.log" />
<mkdir dir="${xserver-data}" />
- <ant antfile="${osee-application-server-launch-ant}" target="run" inheritRefs="true" output="${xserver-log-output}" />
+ <ant antfile="${osee-application-server-launch-ant}"
+ target="run" inheritRefs="true" output="${xserver-log-output}" />
</target>
</configuration>
<goals>
@@ -158,7 +208,8 @@
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
- <ant antfile="${osee-application-server-launch-ant}" target="stopServer" inheritRefs="true" />
+ <ant antfile="${osee-application-server-launch-ant}"
+ target="stopServer" inheritRefs="true" />
</target>
</configuration>
<goals>

Back to the top