diff options
10 files changed, 31 insertions, 12 deletions
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml index 8273c382d43..2659331193b 100644 --- a/features/org.eclipse.osee.external.feature/pom.xml +++ b/features/org.eclipse.osee.external.feature/pom.xml @@ -37,6 +37,8 @@ <plugin id="net.jini" /> <plugin id="org.json" /> <plugin id="org.apache.cxf.core.config" /> + <plugin id="ch.qos.logback.slf4j" /> + <plugin id="javax.ws.rs" /> </excludes> </configuration> </execution> diff --git a/features/org.eclipse.osee.x.core.external.feature/pom.xml b/features/org.eclipse.osee.x.core.external.feature/pom.xml index c2d3fb0c049..6011bcb3a9d 100644 --- a/features/org.eclipse.osee.x.core.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml @@ -27,6 +27,7 @@ <excludes> <plugin id="org.apache.xerces" /> <plugin id="javax.servlet" /> + <plugin id="javax.ws.rs" /> <plugin id="javax.xml" /> <plugin id="org.apache.xml.resolver" /> <plugin id="org.apache.xml.serializer" /> @@ -36,6 +37,14 @@ <plugin id="org.eclipse.persistence.moxy" /> <plugin id="org.apache.cxf.core.config" /> <plugin id="org.eclipse.oss.ajax" /> + <plugin id="org.eclipse.jetty.continuation" /> + <plugin id="org.eclipse.jetty.http" /> + <plugin id="org.eclipse.jetty.io" /> + <plugin id="org.eclipse.jetty.security" /> + <plugin id="org.eclipse.jetty.server" /> + <plugin id="org.eclipse.jetty.servlet" /> + <plugin id="org.eclipse.jetty.util" /> + <plugin id="ch.qos.logback.slf4j" /> </excludes> </configuration> </execution> diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml index f48da6a73f5..bc1a6055e3c 100644 --- a/features/org.eclipse.osee.x.core.feature/feature.xml +++ b/features/org.eclipse.osee.x.core.feature/feature.xml @@ -32,7 +32,7 @@ <import plugin="javax.servlet" version="3.0.0" match="equivalent"/> <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/> <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/> - <import plugin="org.junit"/> + <import plugin="org.junit" version="4.11.0" match="equivalent"/> </requires> <plugin diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml index 188efc3b3c1..0ecc123c56f 100644 --- a/features/org.eclipse.osee.x.server.external.feature/feature.xml +++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml @@ -33,13 +33,13 @@ <import plugin="org.eclipse.equinox.app"/> <import plugin="org.eclipse.equinox.security"/> <import plugin="org.eclipse.equinox.common"/> - <import plugin="org.eclipse.jetty.continuation" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.http" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.io" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.security" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.server" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.servlet" version="8.1.10" match="compatible"/> - <import plugin="org.eclipse.jetty.util" version="8.1.10" match="compatible"/> + <import plugin="org.eclipse.jetty.continuation"/> + <import plugin="org.eclipse.jetty.http"/> + <import plugin="org.eclipse.jetty.io"/> + <import plugin="org.eclipse.jetty.security"/> + <import plugin="org.eclipse.jetty.server"/> + <import plugin="org.eclipse.jetty.servlet"/> + <import plugin="org.eclipse.jetty.util"/> <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/> <import plugin="com.google.gson" version="2.1.0" match="greaterOrEqual"/> <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/> diff --git a/features/org.eclipse.osee.x.server.external.feature/pom.xml b/features/org.eclipse.osee.x.server.external.feature/pom.xml index cd0ff8c5d41..6904fe7ca61 100644 --- a/features/org.eclipse.osee.x.server.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.server.external.feature/pom.xml @@ -28,6 +28,13 @@ <plugin id="org.aopalliance" /> <plugin id="javax.servlet" /> <plugin id="com.google.gson" /> + <plugin id="org.eclipse.jetty.continuation" /> + <plugin id="org.eclipse.jetty.http" /> + <plugin id="org.eclipse.jetty.io" /> + <plugin id="org.eclipse.jetty.security" /> + <plugin id="org.eclipse.jetty.server" /> + <plugin id="org.eclipse.jetty.servlet" /> + <plugin id="org.eclipse.jetty.util" /> </excludes> </configuration> </execution> diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java index bf9f100e605..243781a2691 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java @@ -147,7 +147,7 @@ public final class ImportTraceUnitsOperationTest { new File( tempFolder.getRoot().getAbsolutePath() + IPath.SEPARATOR + topLevelFolderName + IPath.SEPARATOR + folderName); if (!tempFile.exists()) { - tempFolder.newFolder(topLevelFolderName + IPath.SEPARATOR + folderName); + tempFolder.newFolder(topLevelFolderName, folderName); } } for (int i = 0; i < fileNames.length; i++) { diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/VCastAdaCoverage_V5_3_ImportOperationTest.java b/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/VCastAdaCoverage_V5_3_ImportOperationTest.java index a9f11922f1c..7711eeaa3e7 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/VCastAdaCoverage_V5_3_ImportOperationTest.java +++ b/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/VCastAdaCoverage_V5_3_ImportOperationTest.java @@ -108,7 +108,7 @@ public class VCastAdaCoverage_V5_3_ImportOperationTest { copyResource(getURL(bundle, "vcast/test_scheduler.2.LIS"), vcastFolder, "test_scheduler.2.LIS"); copyResource(getURL(bundle, "vcast/test_scheduler.2.xml"), vcastFolder, "test_scheduler.2.xml"); - File resultsFolder = tempFolder.newFolder("vcast/results"); + File resultsFolder = tempFolder.newFolder("vcast", "results"); copyResource(getURL(bundle, "vcast/results/test_unit_1.dat"), resultsFolder, "test_unit_1.dat"); copyResource(getURL(bundle, "vcast/results/test_unit_2.dat"), resultsFolder, "test_unit_2.dat"); copyResource(getURL(bundle, "vcast/results/test_unit_3.dat"), resultsFolder, "test_unit_3.dat"); diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java index 475ec3bf908..b4d634fb336 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java +++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java @@ -33,9 +33,10 @@ public class OseeDatabase implements TestRule { @Override public void evaluate() throws Throwable { Assert.assertNotNull("Osgi Binding cannot be null", osgiBindings); + Assert.assertNotNull("Description cannot be null", description); Assert.assertTrue("Osgi Binding cannot be empty", osgiBindings.length > 0); TestDatabase db = - new TestDatabase(description.getTestClass().getSimpleName(), description.getMethodName(), osgiBindings); + new TestDatabase(description.getClassName(), description.getMethodName(), osgiBindings); try { db.initialize(); base.evaluate(); diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml index 9835c867b4a..2de67614c11 100644 --- a/plugins/org.eclipse.osee.parent/pom.xml +++ b/plugins/org.eclipse.osee.parent/pom.xml @@ -49,7 +49,7 @@ <jasmine-version>1.3.1.0</jasmine-version> - <platform-version-name>luna</platform-version-name> + <platform-version-name>mars</platform-version-name> <!-- <orbit-version>R20150124073747</orbit-version> --> <orbit-version>R20130517111416</orbit-version> <xtext-version>2.0.0</xtext-version> diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip Binary files differindex b6c618af35f..770ba64b622 100644 --- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip +++ b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip |