Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Finkbeiner2011-10-03 22:07:45 +0000
committerRoberto E. Escobar2011-10-03 22:07:45 +0000
commit0887ed580afe44f9ff77094c1e306dbd925f8efa (patch)
tree0e7ee4acd9bcaaae1951877a8d523a77da006c7e /plugins
parent3cac840f61ad21420a1d35eda5380d1cc0aa8635 (diff)
downloadorg.eclipse.osee-0887ed580afe44f9ff77094c1e306dbd925f8efa.tar.gz
org.eclipse.osee-0887ed580afe44f9ff77094c1e306dbd925f8efa.tar.xz
org.eclipse.osee-0887ed580afe44f9ff77094c1e306dbd925f8efa.zip
feature[ats_Q9NLC]: Update dependencies for maven build
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.display.api/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.display.test/.project2
-rw-r--r--plugins/org.eclipse.osee.display.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/pom.xml30
-rw-r--r--plugins/org.eclipse.osee.framework.database.test/pom.xml30
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/pom.xml30
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.osee.x.server.parent/pom.xml5
9 files changed, 103 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.display.api/pom.xml b/plugins/org.eclipse.osee.display.api/pom.xml
index 849e148387f..fadabbb0a3f 100644
--- a/plugins/org.eclipse.osee.display.api/pom.xml
+++ b/plugins/org.eclipse.osee.display.api/pom.xml
@@ -10,7 +10,7 @@
<relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.display</artifactId>
+ <artifactId>org.eclipse.osee.display.api</artifactId>
<packaging>eclipse-plugin</packaging>
<name>OSEE Display - (Incubation)</name>
diff --git a/plugins/org.eclipse.osee.display.test/.project b/plugins/org.eclipse.osee.display.test/.project
index 7c5bac411a2..e46773c8414 100644
--- a/plugins/org.eclipse.osee.display.test/.project
+++ b/plugins/org.eclipse.osee.display.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.display.api.test</name>
+ <name>org.eclipse.osee.display.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.display.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.test/META-INF/MANIFEST.MF
index 9886893e3fc..6cbdffe27a6 100644
--- a/plugins/org.eclipse.osee.display.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.display.test/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Osee Display Test
-Bundle-SymbolicName: org.eclipse.osee.display.api.test
+Bundle-SymbolicName: org.eclipse.osee.display.test
Bundle-Version: 0.9.9.qualifier
Fragment-Host: org.eclipse.osee.display.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.osee.framework.core.test/pom.xml b/plugins/org.eclipse.osee.framework.core.test/pom.xml
new file mode 100644
index 00000000000..b1fed373dcb
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.test/pom.xml
@@ -0,0 +1,30 @@
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.framework.core.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>OSEE Framework Core Test - (Incubation)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.osee.framework.core.test</testSuite>
+ <testClass>org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.database.test/pom.xml b/plugins/org.eclipse.osee.framework.database.test/pom.xml
new file mode 100644
index 00000000000..5cb9ef9dad1
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.database.test/pom.xml
@@ -0,0 +1,30 @@
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.framework.database.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>OSEE Framework Core Test - (Incubation)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.osee.framework.database.test</testSuite>
+ <testClass>org.eclipse.osee.framework.database.test.DatabaseTestSuite</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml b/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml
new file mode 100644
index 00000000000..352fd52e216
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml
@@ -0,0 +1,30 @@
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.framework.resource.management.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>OSEE Framework Resource Management Test- (Incubation)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.osee.framework.resource.management.test</testSuite>
+ <testClass>org.eclipse.osee.framework.resource.management.test.ResourceManagementTestSuite</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
index c0691113e64..b9f71c66f26 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.resource.management.test;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStoreTest;
import org.junit.Assert;
import org.junit.Test;
@@ -20,7 +19,7 @@ import org.junit.Test;
*
* @author Roberto E. Escobar
*/
-public class OptionsTest extends PropertyStoreTest {
+public class OptionsTest {
@Test
public void testClear() {
diff --git a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
index 3f588eaceaa..df0c2b0a395 100644
--- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
@@ -9,13 +9,16 @@ Service-Component: OSGI-INF/*.xml
Import-Package: org.eclipse.core.runtime;version="3.4.0",
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
+ org.eclipse.osee.framework.core.model.cache,
+ org.eclipse.osee.framework.core.model.type,
org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.database,
org.eclipse.osee.framework.database.core,
+ org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.resource.management,
org.eclipse.osee.logger,
org.eclipse.osee.orcs.core,
- org.eclipse.osee.orcs.core.ds
-Require-Bundle: org.eclipse.core.runtime
+ org.eclipse.osee.orcs.core.ds,
+ org.osgi.framework;version="1.6.0"
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml
index 9e35aaef872..ba1afbb2f99 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml
@@ -11,12 +11,15 @@
<modules>
<module>../../plugins/org.eclipse.osee.framework.core</module>
+ <module>../../plugins/org.eclipse.osee.framework.core.test</module>
<module>../../plugins/org.eclipse.osee.framework.core.model</module>
<module>../../plugins/org.eclipse.osee.framework.core.model.test</module>
<module>../../plugins/org.eclipse.osee.framework.resource.management</module>
+ <module>../../plugins/org.eclipse.osee.framework.resource.management.test</module>
<module>../../plugins/org.eclipse.osee.framework.database</module>
+ <module>../../plugins/org.eclipse.osee.framework.database.test</module>
- <module>../../plugins/org.eclipse.osee.display</module>
+ <module>../../plugins/org.eclipse.osee.display.api</module>
<module>../../plugins/org.eclipse.osee.display.view.web</module>
<module>../../plugins/org.eclipse.osee.display.presenter</module>

Back to the top