diff options
| author | jmisinco | 2015-04-24 12:35:53 +0000 |
|---|---|---|
| committer | jmisinco | 2015-04-24 12:35:53 +0000 |
| commit | 8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b (patch) | |
| tree | ffe0acb742f047e5cecc78247a361efa0cd03e8a | |
| parent | e336a127c7645b5e1f076336d35ebbe494208fef (diff) | |
| download | org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.gz org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.xz org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.zip | |
feature: Luna, Java8, Tycho 0.22
Change-Id: I4551f5c5644cf10619c788ca6bfb18597eab550c
237 files changed, 822 insertions, 706 deletions
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml index c581bd8ee58..6364b182681 100644 --- a/features/org.eclipse.osee.external.feature/feature.xml +++ b/features/org.eclipse.osee.external.feature/feature.xml @@ -24,7 +24,7 @@ <import plugin="org.eclipse.osgi.services"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="javax.xml" version="1.3.4" match="compatible"/> - <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/> + <import plugin="javax.servlet" version="3.0.0" match="equivalent"/> <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/> <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/> <import feature="org.eclipse.nebula.widgets.xviewer.feature" version="0.0.0" match="greaterOrEqual"/> 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 ff085b48f78..f5b22d67fcf 100644 --- a/features/org.eclipse.osee.x.core.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml @@ -26,10 +26,12 @@ <configuration> <excludes> <plugin id="org.apache.xerces" /> + <plugin id="javax.servlet" /> <plugin id="javax.xml" /> <plugin id="org.apache.xml.resolver" /> <plugin id="org.apache.xml.serializer" /> <plugin id="org.json" /> + <plugin id="org.eclipse.persistence.asm" /> <plugin id="org.eclipse.persistence.core" /> <plugin id="org.eclipse.persistence.moxy" /> <plugin id="org.apache.cxf.core.config" /> diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml index 32e44580d95..77bc500abb5 100644 --- a/features/org.eclipse.osee.x.core.feature/feature.xml +++ b/features/org.eclipse.osee.x.core.feature/feature.xml @@ -29,7 +29,7 @@ <import plugin="org.apache.commons.codec"/> <import plugin="org.apache.xerces"/> <import plugin="javax.mail.glassfish"/> - <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/> + <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"/> 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 7710ff7ae62..af953924580 100644 --- a/features/org.eclipse.osee.x.server.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.server.external.feature/pom.xml @@ -26,6 +26,8 @@ <configuration> <excludes> <plugin id="org.aopalliance" /> + <plugin id="javax.servlet" /> + <plugin id="com.google.gson" /> </excludes> </configuration> </execution> diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.x.server.feature/feature.xml index d4406b1bdbb..06da8f5dec3 100644 --- a/features/org.eclipse.osee.x.server.feature/feature.xml +++ b/features/org.eclipse.osee.x.server.feature/feature.xml @@ -42,7 +42,7 @@ version="0.0.0"/> <requires> - <import plugin="javax.servlet"/> + <import plugin="javax.servlet" version="3.0.0" match="equivalent"/> <import plugin="org.eclipse.osgi"/> <import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/> </requires> diff --git a/plugins/jms.activemq.launch/META-INF/MANIFEST.MF b/plugins/jms.activemq.launch/META-INF/MANIFEST.MF index 02a84fe10eb..0eff8e4eb19 100644 --- a/plugins/jms.activemq.launch/META-INF/MANIFEST.MF +++ b/plugins/jms.activemq.launch/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: jms.activemq.launch;singleton:=true Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.jms;version="1.1.1", org.apache.activemq, org.apache.activemq.advisory, diff --git a/plugins/jms.libraries/META-INF/MANIFEST.MF b/plugins/jms.libraries/META-INF/MANIFEST.MF index b54eead278e..5e5a30841e6 100644 --- a/plugins/jms.libraries/META-INF/MANIFEST.MF +++ b/plugins/jms.libraries/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: JMS Libraries Bundle-SymbolicName: jms.libraries Bundle-Version: 0.22.0.qualifier Eclipse-BuddyPolicy: global -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: libs/geronimo-j2ee-management_1.0_spec-1.0.jar, libs/geronimo-jms_1.1_spec-1.1.1.jar, libs/activemq-core-5.3.0.jar diff --git a/plugins/org.eclipse.osee.account.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.admin.test/META-INF/MANIFEST.MF index 6c61db98631..9ce43f53acd 100644 --- a/plugins/org.eclipse.osee.account.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.admin.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Account Admin Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.admin.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.account.admin;bundle-version="0.17.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF index e2208ce2272..dac2f8a9b09 100644 --- a/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Account Admin API (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: org.eclipse.osee.authentication.admin, org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF index a11d98aac9a..7811d79f193 100644 --- a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Account REST Client (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.rest.client Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: com.google.inject, com.google.inject.binder, diff --git a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF index a0ace6315c9..d1c4a09af32 100644 --- a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: OSEE Account REST Model (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.rest.model Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.account.rest.model Import-Package: org.eclipse.osee.framework.jdk.core.type diff --git a/plugins/org.eclipse.osee.account.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.test/META-INF/MANIFEST.MF index 81805f2ae37..a27ae39373c 100644 --- a/plugins/org.eclipse.osee.account.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Account REST API Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.rest.test Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.account.rest;bundle-version="0.17.0" Import-Package: org.apache.aries.blueprint;version="1.3.0", diff --git a/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF index 78dfef189c7..82aaddbe7a5 100644 --- a/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Accounts REST API (Incubation) Bundle-SymbolicName: org.eclipse.osee.account.rest Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Osee-Template: OSEE-INF/templates/*.html Import-Package: javax.annotation.security, diff --git a/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF index a978de81e68..3f2958f0163 100644 --- a/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Activity Logging API - (Incubation) Bundle-SymbolicName: org.eclipse.osee.activity.api Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.activity.api Import-Package: javax.ws.rs;version="2.0.0", javax.ws.rs.core;version="2.0.0", diff --git a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF index a6afd9cf285..73f0a2011df 100644 --- a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Activity Logging Impl - (Incubation) Bundle-SymbolicName: org.eclipse.osee.activity Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Osee-Data: OSEE-INF/* diff --git a/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF index 9350434a8c9..12f42633e06 100644 --- a/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.app.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.app -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.junit, org.junit.runner, org.junit.runners diff --git a/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF index b69b8759a6d..0c2cafe3a52 100644 --- a/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Server Application Support (Incubation) Bundle-SymbolicName: org.eclipse.osee.app Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.ws.rs;version="2.0.0", javax.ws.rs.core;version="2.0.0", org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF index dde94c1989d..9ce8f9e269a 100644 --- a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Osee Ats Api (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.api Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ats.api, org.eclipse.osee.ats.api.agile, org.eclipse.osee.ats.api.ai, diff --git a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF index 0e48a5c9903..61a2c185a0e 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF @@ -90,6 +90,6 @@ Import-Package: org.eclipse.core.filesystem, Export-Package: org.eclipse.osee.ats.client.demo, org.eclipse.osee.ats.client.demo.config -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.osee.ats.client.demo.internal.Activator Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF index 9f54a58ebb2..8caea1af182 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ATS Client Integration Tests (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.client.integration.tests Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml index 27280b16314..150ae0ac021 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml @@ -36,25 +36,36 @@ <eventSystem>new</eventSystem> <osee.is.in.db.init>true</osee.is.in.db.init> <osee.application.server>http://localhost:${ats-server-port}</osee.application.server> + <org.eclipse.swt.browser.DefaultType>webkit</org.eclipse.swt.browser.DefaultType> +<!-- <org.eclipse.swt.browser.UseWebKitGTK>true</org.eclipse.swt.browser.UseWebKitGTK> --> </systemProperties> <redirectTestOutputToFile>false</redirectTestOutputToFile> - <dependencies> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.ats.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.ats.client.demo.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.sdk</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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.ats.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.osee.ats.client.demo.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.sdk</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> @@ -162,8 +173,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> @@ -185,8 +196,8 @@ <property name="xserver-port" value="${ats-server-port}" /> <property name="xserver-telnet-port" value="${ats-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> diff --git a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF index f86be38f534..c94d4c4c4bb 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.core.client.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ats.core.client -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF index f493a4a7373..610fc22297f 100644 --- a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.22.0.qualifier Eclipse-ExtensibleAPI: true Bundle-Activator: org.eclipse.osee.ats.core.client.internal.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.inject, javax.ws.rs.client;version="2.0.0", javax.ws.rs.core;version="2.0.0", diff --git a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF index 5263ca3f6b5..ff80fe9a3a8 100644 --- a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ATS Core Test Bundle-SymbolicName: org.eclipse.osee.ats.core.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ats.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF index e7664e0156d..a189f05fe87 100644 --- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ATS Core Bundle-SymbolicName: org.eclipse.osee.ats.core;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.ats.dsl.integration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl.integration.test/META-INF/MANIFEST.MF index 245bbc23cd0..56ed0c2eee3 100644 --- a/plugins/org.eclipse.osee.ats.dsl.integration.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl.integration.test/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: ATS DSL Integration Test Bundle-SymbolicName: org.eclipse.osee.ats.dsl.integration.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ats.dsl.integration -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.junit;bundle-version="4.11.0" diff --git a/plugins/org.eclipse.osee.ats.dsl.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl.integration/META-INF/MANIFEST.MF index 4d2630a82a6..1bcbef5012b 100644 --- a/plugins/org.eclipse.osee.ats.dsl.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl.integration/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ATS DSL Integration Bundle-SymbolicName: org.eclipse.osee.ats.dsl.integration;singleton:=true Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF index 3bd08fc6141..f0599d06d19 100644 --- a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Import-Package: org.apache.commons.logging, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.skynet.core.attribute, org.eclipse.osee.framework.ui.skynet -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ats.dsl.ui.contentassist.antlr, org.eclipse.osee.ats.dsl.ui.contentassist, org.eclipse.osee.ats.dsl.ui.quickfix diff --git a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF index 6fd5e48f45b..11a74888953 100644 --- a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.22.0.qualifier Bundle-SymbolicName: org.eclipse.osee.ats.dsl;singleton:=true Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/*.xml -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ats.dsl, org.eclipse.osee.ats.dsl.atsDsl, org.eclipse.osee.ats.dsl.atsDsl.impl, diff --git a/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF index c2f679e89f4..d3a5ac07487 100644 --- a/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.help.ui.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ats.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.ats.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.help.ui/META-INF/MANIFEST.MF index 6314d4b645c..bbc5199f6ed 100644 --- a/plugins/org.eclipse.osee.ats.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.help.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ATS Help Bundle-SymbolicName: org.eclipse.osee.ats.help.ui;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.core.data Export-Package: org.eclipse.osee.ats.help.ui diff --git a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF index eb7e5720a72..bd790a3e163 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.impl.test Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ats.impl -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.emf.common.util, org.eclipse.osee.ats.api.workdef, org.eclipse.osee.ats.dsl.atsDsl.impl diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF index 4ea3bf5bf72..a2d7533ebfd 100644 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ATS Implementation (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.impl;singleton:=true Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.cache, javax.ws.rs;version="2.0.0", javax.ws.rs.core;version="2.0.0", diff --git a/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF index e3ccd2eddab..eb7270956bc 100644 --- a/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Ats Presenter Mocks (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.mocks Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.ats.api, org.eclipse.osee.ats.api.ai, org.eclipse.osee.ats.api.commit, diff --git a/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF index 1b967d94388..349e2f58dc4 100644 --- a/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.osee.ats.reports.burndown.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.ui, org.eclipse.ui.forms -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.runtime, org.eclipse.osee.ats, diff --git a/plugins/org.eclipse.osee.ats.reports.efficiency/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports.efficiency/META-INF/MANIFEST.MF index 54b5dd147ee..7a04a76fa06 100644 --- a/plugins/org.eclipse.osee.ats.reports.efficiency/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports.efficiency/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.ui, org.eclipse.ui.forms, org.eclipse.osee.ats.api -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.runtime, org.eclipse.osee.ats, diff --git a/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF index b4e38c6dad9..dd8c42f0c34 100644 --- a/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.osee.ats.reports.split.Activator Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.ui, org.eclipse.ui.forms -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.runtime, org.eclipse.osee.ats, diff --git a/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF index d90e831954e..db0ebbee224 100644 --- a/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.reports;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.ats.reports.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.birt.report.viewer.utilities, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF index f9458e6fcc9..867984f6ce6 100644 --- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Osee Ats Rest(Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.rest Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Osee-JaxRs-Resource: /web/*;path=/ats/cpa/ui, diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF index fcf0d6f082c..8a59a9786ba 100644 --- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF @@ -211,4 +211,4 @@ Import-Package: com.google.gson, org.eclipse.zest.core.viewers, org.eclipse.zest.core.widgets, org.json -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java index 62b0319aa6c..cfbfed7273a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java @@ -31,6 +31,8 @@ import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -81,6 +83,15 @@ public class SMADetailsSection extends SectionPart { Composite composite = toolkit.createComposite(getSection(), toolkit.getBorderStyle() | SWT.WRAP); composite.setLayout(ALayout.getZeroMarginLayout()); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + composite.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); browser = new Browser(composite, SWT.NONE); GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); @@ -165,12 +176,4 @@ public class SMADetailsSection extends SectionPart { return message; } - @Override - public void dispose() { - if (Widgets.isAccessible(browser)) { - browser.dispose(); - } - super.dispose(); - } - } diff --git a/plugins/org.eclipse.osee.authentication.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.admin.test/META-INF/MANIFEST.MF index 889f14bc90e..b45b12a0ee5 100644 --- a/plugins/org.eclipse.osee.authentication.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.admin.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Authentication Admin Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.authentication.admin.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.authentication.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF index 2924638ede9..3fabb36b4e5 100644 --- a/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Authentication Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.authentication.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.logger, diff --git a/plugins/org.eclipse.osee.authentication.ldap.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.ldap.test/META-INF/MANIFEST.MF index 8c514443e6c..2c6da02da46 100644 --- a/plugins/org.eclipse.osee.authentication.ldap.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.ldap.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.authentication.ldap.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.authentication.ldap -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.hamcrest.core, org.junit, org.junit.rules, diff --git a/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF index f090b1fb885..134941893e9 100644 --- a/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE LDAP Authentication Provider (Incubation) Bundle-SymbolicName: org.eclipse.osee.authentication.ldap Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: org.eclipse.osee.authentication.admin, org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF index 14ecb9437ee..ef67803cc8e 100644 --- a/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Authorization Admin Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.authorization.admin.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.authorization.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF index 435af1d1125..71c1924d8ec 100644 --- a/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Authorization Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.authorization.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.authorization.admin Import-Package: org.eclipse.osee.framework.core.data, diff --git a/plugins/org.eclipse.osee.cache.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cache.admin.test/META-INF/MANIFEST.MF index 5e1be9dd5f4..3ebccfb28e3 100644 --- a/plugins/org.eclipse.osee.cache.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cache.admin.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Cache Admin Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.cache.admin.test Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.cache.admin Require-Bundle: org.junit, diff --git a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF index 94ee32009f0..607f63da9b9 100644 --- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: Cache Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.cache.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.cache;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", - com.google.common.util.concurrent;version="[11.0.0,15.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base, + com.google.common.cache, + com.google.common.collect, + com.google.common.util.concurrent, org.eclipse.osee.framework.jdk.core.type Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.cache.admin diff --git a/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF index 58530456099..c7bad2e07a3 100644 --- a/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Client Demo (Incubation) Bundle-SymbolicName: org.eclipse.osee.client.demo;singleton:=true 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: org.eclipse.core.filesystem, org.eclipse.osee.define.traceability, diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF index 5a5c6b038d1..d28d4020116 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Client Integration Tests Bundle-SymbolicName: org.eclipse.osee.client.integration.tests Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.ws.rs.client;version="2.0.0", javax.ws.rs.core;version="2.0.0", org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.client.integration.tests/pom.xml index c9aafd4465c..148776e80de 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/pom.xml +++ b/plugins/org.eclipse.osee.client.integration.tests/pom.xml @@ -36,20 +36,31 @@ <eventSystem>new</eventSystem> <osee.is.in.db.init>true</osee.is.in.db.init> <osee.application.server>http://localhost:${osee-server-port}</osee.application.server> + <org.eclipse.swt.browser.DefaultType>webkit</org.eclipse.swt.browser.DefaultType> +<!-- <org.eclipse.swt.browser.UseWebKitGTK>true</org.eclipse.swt.browser.UseWebKitGTK> --> </systemProperties> <redirectTestOutputToFile>false</redirectTestOutputToFile> - <dependencies> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.client.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.sdk</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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.client.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.sdk</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> @@ -157,8 +168,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> @@ -180,8 +191,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> diff --git a/plugins/org.eclipse.osee.client.test.framework/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.test.framework/META-INF/MANIFEST.MF index 8631352dfcc..f8216ca3b30 100644 --- a/plugins/org.eclipse.osee.client.test.framework/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.test.framework/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Client Test Framework (Incubation) Bundle-SymbolicName: org.eclipse.osee.client.test.framework Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.junit, org.eclipse.core.runtime diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cluster.hazelcast/META-INF/MANIFEST.MF index 59eb1849b1f..e4a8871c3c1 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cluster.hazelcast/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Hazelcast Cluster Bundle-SymbolicName: org.eclipse.osee.cluster.hazelcast Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.hazelcast.config, com.hazelcast.core, com.hazelcast.impl, diff --git a/plugins/org.eclipse.osee.cluster.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cluster.rest/META-INF/MANIFEST.MF index d793fedab25..1d8d1dc5df5 100644 --- a/plugins/org.eclipse.osee.cluster.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cluster.rest/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Cluster Rest Bundle-SymbolicName: org.eclipse.osee.cluster.rest Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs, javax.ws.rs.core, diff --git a/plugins/org.eclipse.osee.cluster/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cluster/META-INF/MANIFEST.MF index a16622c66fb..c9dea418c91 100644 --- a/plugins/org.eclipse.osee.cluster/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cluster/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: OSEE Cluster Bundle-SymbolicName: org.eclipse.osee.cluster Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.cluster diff --git a/plugins/org.eclipse.osee.config.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.config.admin.test/META-INF/MANIFEST.MF index b2a12b907f0..d51afa7355e 100644 --- a/plugins/org.eclipse.osee.config.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.config.admin.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Config Admin Test Bundle-SymbolicName: org.eclipse.osee.config.admin.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.config.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF index f9b1dc547ae..8a38d61bbdc 100644 --- a/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Config Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.config.admin Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.console.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.console.admin.test/META-INF/MANIFEST.MF index 49895a42152..a58af334955 100644 --- a/plugins/org.eclipse.osee.console.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.console.admin.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.console.admin.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.console.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.junit, org.junit.runner, org.junit.runners diff --git a/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF index f2ce63c82ba..d5756debcb0 100644 --- a/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Console Admin Bundle-SymbolicName: org.eclipse.osee.console.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.event, org.eclipse.osee.executor.admin, org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.coverage.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.demo/META-INF/MANIFEST.MF index 704f720bd3f..22bad39d362 100644 --- a/plugins/org.eclipse.osee.coverage.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.demo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Coverage Demo (Incubation) Bundle-SymbolicName: org.eclipse.osee.coverage.demo;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.ats.core.client.util, org.eclipse.osee.coverage, org.eclipse.osee.coverage.blam, diff --git a/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF index df2a082759b..fdbbee3a873 100644 --- a/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.coverage.help.ui.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.coverage.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.help.ui/META-INF/MANIFEST.MF index 337a98e7374..98349aa32aa 100644 --- a/plugins/org.eclipse.osee.coverage.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.help.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Covverage Help Bundle-SymbolicName: org.eclipse.osee.coverage.help.ui;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.core.data Export-Package: org.eclipse.osee.coverage.help.ui diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF index af11877e3e7..f9ce8195c45 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Coverage Integration Tests (Incubation) Bundle-SymbolicName: org.eclipse.osee.coverage.integration.tests Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml b/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml index 6ad96ccc951..d31ad68ff21 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml +++ b/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml @@ -36,40 +36,51 @@ <eventSystem>new</eventSystem> <osee.is.in.db.init>true</osee.is.in.db.init> <osee.application.server>http://localhost:${osee-server-port}</osee.application.server> + <org.eclipse.swt.browser.DefaultType>webkit</org.eclipse.swt.browser.DefaultType> +<!-- <org.eclipse.swt.browser.UseWebKitGTK>true</org.eclipse.swt.browser.UseWebKitGTK> --> </systemProperties> <redirectTestOutputToFile>false</redirectTestOutputToFile> - <dependencies> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.coverage.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.ats.client.demo.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.ats.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.client.demo.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.client.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.sdk</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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.coverage.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.osee.ats.client.demo.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.osee.ats.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.osee.client.demo.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.osee.client.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.sdk</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> @@ -178,8 +189,8 @@ <property name="xserver-log-output" value="${project.build.directory}/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> @@ -201,8 +212,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> diff --git a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF index e9ef7107a34..f456b45e680 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.coverage.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.database.init, org.junit, diff --git a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF index 7b3262b2fad..5c6bab839e6 100644 --- a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF @@ -92,7 +92,7 @@ Import-Package: com.google.common.io;version="[11.0.0,15.0.0)", org.eclipse.ui.part, org.osgi.framework, org.osgi.util.tracker -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.coverage, org.eclipse.osee.coverage.blam, org.eclipse.osee.coverage.editor, diff --git a/plugins/org.eclipse.osee.define.report.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.report.api/META-INF/MANIFEST.MF index f93b3e544f0..a811e4551c2 100644 --- a/plugins/org.eclipse.osee.define.report.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.report.api/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Define Report API (Incubation) Bundle-SymbolicName: org.eclipse.osee.define.report.api Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Export-Package: org.eclipse.osee.define.report.api Import-Package: javax.ws.rs, diff --git a/plugins/org.eclipse.osee.define.report.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.report.test/META-INF/MANIFEST.MF index f590752fbaf..1c1ec78e05f 100644 --- a/plugins/org.eclipse.osee.define.report.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.report.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.define.report.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.define.report -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.hamcrest.core, org.junit, org.junit.rules, diff --git a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF index 9dd82d7d4c2..4f15a12a668 100644 --- a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Server Define Report (Incubation) Bundle-SymbolicName: org.eclipse.osee.define.report Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.base, + com.google.common.collect, javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.app, diff --git a/plugins/org.eclipse.osee.define.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.test/META-INF/MANIFEST.MF index 9b72f99ab68..7b0a0e8c564 100644 --- a/plugins/org.eclipse.osee.define.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.test/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.define.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.define -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Export-Package: org.eclipse.osee.define diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF index 92b5735fb42..71c2edb3978 100644 --- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF @@ -84,4 +84,4 @@ Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)", org.eclipse.osee.ote.define.artifacts, org.eclipse.ui.forms.editor, org.eclipse.ui.forms.widgets -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.disposition.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest.model/META-INF/MANIFEST.MF index 049f7d6e74b..137c8e98abe 100644 --- a/plugins/org.eclipse.osee.disposition.rest.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.disposition.rest.model/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Disposition REST Model (Incubation) Bundle-SymbolicName: org.eclipse.osee.disposition.rest.model Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Export-Package: org.eclipse.osee.disposition.model Import-Package: org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF index cf97ea60f5e..9d479fc7613 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Disposition REST Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.disposition.rest.test Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.disposition.rest Import-Package: org.apache.aries.blueprint;version="1.3.0", diff --git a/plugins/org.eclipse.osee.disposition.rest.test/pom.xml b/plugins/org.eclipse.osee.disposition.rest.test/pom.xml index 1be83bbc792..530e5c3bc17 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/pom.xml +++ b/plugins/org.eclipse.osee.disposition.rest.test/pom.xml @@ -26,28 +26,57 @@ <systemProperties combine.children="append"> <javax.ws.rs.ext.RuntimeDelegate>org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl</javax.ws.rs.ext.RuntimeDelegate> </systemProperties> - <dependencies> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.x.core.external.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.x.core.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.orcs.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.disposition.feature</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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.disposition.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <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> diff --git a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF index 2173618287e..4fcc985cc4b 100644 --- a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Disposition REST (Incubation) Bundle-SymbolicName: org.eclipse.osee.disposition.rest Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Osee-JaxRs-Resource: /web/*;path=/dispo Import-Package: - com.google.common.collect;version="[11.0.0,15.0.0)", + com.google.common.collect, javax.ws.rs, javax.ws.rs.core, javax.ws.rs.ext, diff --git a/plugins/org.eclipse.osee.distributed/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.distributed/META-INF/MANIFEST.MF index 371fd1626ab..a10a5ac69bc 100644 --- a/plugins/org.eclipse.osee.distributed/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.distributed/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: Osee Distributed Bundle-SymbolicName: org.eclipse.osee.distributed Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.distributed diff --git a/plugins/org.eclipse.osee.event.osgi/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.event.osgi/META-INF/MANIFEST.MF index 660b46de95f..cce9a063738 100644 --- a/plugins/org.eclipse.osee.event.osgi/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.event.osgi/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Event Service over Osgi (Incubation) Bundle-SymbolicName: org.eclipse.osee.event.osgi Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: org.eclipse.osee.event, org.eclipse.osee.logger, diff --git a/plugins/org.eclipse.osee.event/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.event/META-INF/MANIFEST.MF index a1279b6d858..144b686dbf9 100644 --- a/plugins/org.eclipse.osee.event/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.event/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Event (Incubation) Bundle-SymbolicName: org.eclipse.osee.event Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.event Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.executor.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.executor.admin.test/META-INF/MANIFEST.MF index 87cee623108..5137ebdbce1 100644 --- a/plugins/org.eclipse.osee.executor.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.executor.admin.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.executor.admin.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.executor.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core diff --git a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF index 26ab7e88c46..9895e63cd1d 100644 --- a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: OSEE Executor Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.executor.admin Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.executor.admin -Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)", - com.google.common.util.concurrent;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.collect, + com.google.common.util.concurrent;version="15.0.0", org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.logger Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.framework.access.provider/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access.provider/META-INF/MANIFEST.MF index b239528b435..d938fee7aed 100644 --- a/plugins/org.eclipse.osee.framework.access.provider/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.access.provider/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Framework Access Provider Bundle-SymbolicName: org.eclipse.osee.framework.access.provider;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, diff --git a/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF index 806dae6bfe8..58664cd0a29 100644 --- a/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.access.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.access -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.access.test Import-Package: org.eclipse.osee.framework.core.model.access.exp diff --git a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF index a56768208e5..4ccff3868d6 100644 --- a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Osee Access Bundle-SymbolicName: org.eclipse.osee.framework.access;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.cache;version="[11.0.0,15.0.0)", org.eclipse.core.resources, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index ebe4f0d1382..25a6710021d 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -703,7 +703,7 @@ public class AccessControlService implements IAccessControlService { if (artifactLockCache.containsKey(branchUuid, objectArtId) && canUnlockObject(object, subject)) { AccessObject accessObject = getAccessObject(object); removeAccessControlDataIf(true, new AccessControlData(subject, accessObject, PermissionEnum.LOCK, false)); - artifactLockCache.remove(branchUuid, objectArtId); + artifactLockCache.removeAndGet(branchUuid, objectArtId); event.getArtifacts().add(object.getBasicGuidArtifact()); lockedArts.add(object); } diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.authentication.ldap.core/META-INF/MANIFEST.MF index 74725531aa0..eb834d93a9e 100644 --- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.authentication.ldap.core;singlet Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.framework.authentication.ldap.core, org.eclipse.osee.framework.authentication.ldap.core.service diff --git a/plugins/org.eclipse.osee.framework.branch.gantt/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.branch.gantt/META-INF/MANIFEST.MF index c1fe2a34cb0..4e2d983dbfe 100644 --- a/plugins/org.eclipse.osee.framework.branch.gantt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.branch.gantt/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.osee.branch.gantt.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.nebula.widgets.ganttchart, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF index 9e5753a7d69..f11ae72d513 100644 --- a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.client;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.framework.core.client.internal.CoreClientActivator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF index 08e56d9195d..bb9a3bed90f 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.integration.test;single Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.dsl.integration -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.junit;version="4.8.2", diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF index 3623bf7f1c2..1f50f99896d 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE ORCS DSL Integration - (Incubation) Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.integration;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.dsl, diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration.test/META-INF/MANIFEST.MF index cd621c8b6e6..2547eecd508 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration.test/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.ui.integration.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.dsl.ui.integration -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.core.dsl.ui.integration diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF index 7466d3648ae..b656464a387 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE ORCS DSL UI Integration - (Incubation) Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.ui.integration;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.commands.common, org.eclipse.core.resources, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF index d41b16be54f..40694f317ce 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF @@ -24,4 +24,4 @@ Export-Package: org.eclipse.osee.framework.core.dsl.ui, org.eclipse.osee.framework.core.dsl.ui.contentassist.antlr, org.eclipse.osee.framework.core.dsl.ui.quickfix Bundle-Activator: org.eclipse.osee.framework.core.dsl.ui.internal.OseeDslActivator -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF index 5b3d90fe1ef..be367fa92b5 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF @@ -33,4 +33,4 @@ Export-Package: org.eclipse.osee.framework.core.dsl, org.eclipse.osee.framework.core.dsl.validation, org.eclipse.osee.framework.core.dsl.scoping, org.eclipse.osee.framework.core.dsl.formatting -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/conversion/OseeStringValueConverter.java b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/conversion/OseeStringValueConverter.java index f00849d9d03..5719091703f 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/conversion/OseeStringValueConverter.java +++ b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/conversion/OseeStringValueConverter.java @@ -37,7 +37,7 @@ public class OseeStringValueConverter extends DefaultTerminalConverters { } @Override - protected IValueConverter<Object> getConverter(String lexerRule) { + public IValueConverter<Object> getConverter(String lexerRule) { return super.getConverter(lexerRule); } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF index bc92422dfbe..794e435826e 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.model.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.model -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.11.0" Export-Package: org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.cache, diff --git a/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF index 0274126ffc4..02ca97fc7eb 100644 --- a/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Core Model Bundle-SymbolicName: org.eclipse.osee.framework.core.model;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF index b8302929b71..e53c80c6057 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.server.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.server -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core diff --git a/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF index 0cb4f4a2944..29eb58d8a63 100644 --- a/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Core Server Plug-in Bundle-SymbolicName: org.eclipse.osee.framework.core.server Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", org.eclipse.core.runtime.jobs, diff --git a/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF index 8a31958a0f6..35c7d825fa1 100644 --- a/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java index 10323d9e48f..090327fb3ee 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java @@ -14,6 +14,7 @@ import java.io.File; import java.io.InputStream; import java.util.Collection; import java.util.Dictionary; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -21,7 +22,9 @@ import org.osgi.framework.BundleListener; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkListener; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceObjects; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; @@ -163,4 +166,15 @@ public class MockBundleContext implements BundleContext { return null; } + @Override + public <S> ServiceRegistration<S> registerService(Class<S> clazz, + ServiceFactory<S> factory, Dictionary<String, ?> properties) { + return null; + } + + @Override + public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { + return null; + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF index ee685f38e5a..fba1ed2c67c 100644 --- a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.framework.core.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.httpclient, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, diff --git a/plugins/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF index e3689921643..7364cd6c7c8 100644 --- a/plugins/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.database.init;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.framework.database.init.internal.DatabaseInitActivator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.lang;version="2.4.0", org.apache.commons.lang.builder, org.apache.xml.serialize;version="2.9.0", diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.dev.help.ui.test/META-INF/MANIFEST.MF index a2a6f099143..65d811d4bfb 100644 --- a/plugins/org.eclipse.osee.framework.dev.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.dev.help.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.dev.help.ui.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.dev.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.dev.help.ui/META-INF/MANIFEST.MF index 15224a8f1c4..fd15327a894 100644 --- a/plugins/org.eclipse.osee.framework.dev.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.dev.help.ui/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: OSEE Framework Dev Help Bundle-SymbolicName: org.eclipse.osee.framework.dev.help.ui;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.framework.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.help.ui.test/META-INF/MANIFEST.MF index 96e14b7f371..11134c43f04 100644 --- a/plugins/org.eclipse.osee.framework.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.help.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.help.ui.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF index ca60ab50695..83386649336 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Framework Help Bundle-SymbolicName: org.eclipse.osee.framework.help.ui;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.framework.help.ui Import-Package: org.eclipse.osee.framework.core.data diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF index f8bd58040c9..fc3e6ac31a2 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.jdk.core.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.jdk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF index e869f9a316f..5747ac59fe0 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Export-Package: org.eclipse.osee.framework.jdk.core.collection.tree, org.eclipse.osee.framework.jdk.core.util.xml.excel, org.eclipse.osee.framework.jdk.core.util.xml.parser, org.eclipse.osee.framework.jdk.core.validate -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.codec.binary, org.apache.xml.serialize;version="2.9.0" diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMap.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMap.java index 33d0cb60537..d59a5d3e746 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMap.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMap.java @@ -185,7 +185,7 @@ public class CompositeKeyHashMap<KeyOne, KeyTwo, Value> implements Map<Pair<KeyO return values; } - public Value remove(KeyOne key1, KeyTwo key2) { + public Value removeAndGet(KeyOne key1, KeyTwo key2) { Value value = map.remove(threadLocalKey.get().set(key1, key2)); singleKeyMap.removeValue(key1, key2); return value; diff --git a/plugins/org.eclipse.osee.framework.jini/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jini/META-INF/MANIFEST.MF index 63447ee025a..0145bf5cb81 100644 --- a/plugins/org.eclipse.osee.framework.jini/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.jini/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.osee.framework.jdk.core, net.jini, org.eclipse.osee.framework.plugin.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.logging diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF index 5867659de07..7166a9f74eb 100644 --- a/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.framework.lifecycle.test;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclispe.org Fragment-Host: org.eclipse.osee.framework.lifecycle -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.lifecycle.test diff --git a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF index 01ae78a1ba2..83b4b5997df 100644 --- a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Osee Lifecycle Bundle-SymbolicName: org.eclipse.osee.framework.lifecycle;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.model, diff --git a/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF index 5204b015867..24ca07fe559 100644 --- a/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: org.eclipse.osee.framework.logging.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit diff --git a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF index 65d451b7518..c7d8d7c8dc2 100644 --- a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.jdk.core.util Export-Package: org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF index 85e3ddacce5..1d9b987e746 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Servlet Plug-in Bundle-SymbolicName: org.eclipse.osee.framework.manager.servlet Bundle-Version: 0.22.0.qualifier Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.collect, javax.servlet, javax.servlet.http, org.eclipse.core.runtime, @@ -31,4 +31,4 @@ Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)", org.osgi.service.http, org.osgi.util.tracker Service-Component: OSGI-INF/*.xml -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF index 0efb8423c5a..4d4cd17ebfe 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.framework.messaging.event.res.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.messaging.event.res -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.messaging.event.res.test diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF index bd9adf542ab..11cba9f0d7f 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Eclipse-ExtensibleAPI: true Bundle-ActivationPolicy: lazy Bundle-Description: Skynet Event Service - Skynet Cache Network Manager Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF index 2dfe1c7e054..fe01f7b6e47 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.osee.framework.messaging Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: javax.xml.bind, diff --git a/plugins/org.eclipse.osee.framework.messaging.test/pom.xml b/plugins/org.eclipse.osee.framework.messaging.test/pom.xml index 2d20f678a1a..be1e169a28d 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/pom.xml +++ b/plugins/org.eclipse.osee.framework.messaging.test/pom.xml @@ -23,18 +23,27 @@ <configuration> <testSuite>org.eclipse.osee.framework.messaging.test</testSuite> <testClass>org.eclipse.osee.framework.messaging.integration.AllMessagingIntegrationTestSuite</testClass> - <dependencies> - <dependency> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> <type>eclipse-plugin</type> - <artifactId>jms.libraries</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> + <id>jms.libraries</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> <type>eclipse-plugin</type> - <artifactId>jms.activemq.launch</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <id>jms.activemq.launch</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF index d6cffff1794..e4c536aaf30 100644 --- a/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.messaging;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.framework.messaging.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.jms, javax.management, javax.management.j2ee, diff --git a/plugins/org.eclipse.osee.framework.plugin.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.plugin.core/META-INF/MANIFEST.MF index 409f6346529..d8d88f51e24 100644 --- a/plugins/org.eclipse.osee.framework.plugin.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.plugin.core/META-INF/MANIFEST.MF @@ -20,4 +20,4 @@ Import-Package: org.eclipse.core.resources, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.io, org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF index b3607089777..da68f9f5eb1 100644 --- a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF @@ -14,4 +14,4 @@ Import-Package: org.eclipse.osee.framework.core.exception, org.junit.runners, org.osgi.framework, org.osgi.util.tracker -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF index 82a8aa3e5b1..74c476c0f77 100644 --- a/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.framework.resource.management, org.eclipse.osee.framework.resource.management.exception, org.eclipse.osee.framework.resource.management.util -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF index 943a49006b2..8db26596e28 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Test Fragment Bundle-SymbolicName: org.eclipse.osee.framework.skynet.core.test;singleton:=true Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.framework.skynet.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF index fb03c432fdd..f734fb54d85 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF @@ -88,6 +88,6 @@ Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)", org.eclipse.osee.orcs.rest.client, org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index 2c352f8aa6b..97d06f8bfee 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -124,7 +124,7 @@ public final class ArtifactLoader { Integer artId = loadPair.getFirst(); Long branchUuid = loadPair.getSecond(); removeAndUnlock(artId, branchUuid); - locks.remove(artId, branchUuid); + locks.removeAndGet(artId, branchUuid); } } } @@ -135,7 +135,7 @@ public final class ArtifactLoader { private static void removeAndUnlock(Integer artId, Long branchUuid) { ReentrantLock lock = null; synchronized (loadingActiveMap) { - lock = loadingActiveMap.remove(artId, branchUuid); + lock = loadingActiveMap.removeAndGet(artId, branchUuid); } if (lock != null && lock.isLocked()) { lock.unlock(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java index 3f502d88b19..7d8fe3fead7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java @@ -46,8 +46,8 @@ public abstract class AbstractArtifactCache { public void deCache(Artifact artifact) { Long key2 = getKey2(artifact); - idCache.remove(artifact.getArtId(), key2); - guidCache.remove(artifact.getGuid(), key2); + idCache.removeAndGet(artifact.getArtId(), key2); + guidCache.removeAndGet(artifact.getGuid(), key2); } public Collection<Artifact> getAll() { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java index ca17b402a94..155d3ea4da7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java @@ -49,7 +49,7 @@ public class ActiveArtifactCache extends AbstractArtifactCache { @Override public void deCache(Artifact artifact) { super.deCache(artifact); - byArtifactTypeCache.remove(artifact.getArtifactType(), new ArtifactKey(artifact)); + byArtifactTypeCache.removeAndGet(artifact.getArtifactType(), new ArtifactKey(artifact)); } @Override diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java index 6cee0857f6f..43c90fcf357 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java @@ -99,7 +99,7 @@ public class RelationOrderData { public void removeOrderList(IRelationType type, RelationSide side) throws OseeCoreException { Conditions.checkNotNull(type, "relationType"); Conditions.checkNotNull(side, "relationSide"); - lists.remove(type.getName(), side.name()); + lists.removeAndGet(type.getName(), side.name()); } public boolean hasEntries() { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java index 39ed9b211f4..005eea92874 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java @@ -349,7 +349,7 @@ public final class SkynetTransaction extends TransactionOperation<Branch> { private void updateTxItem(BaseTransactionData itemToCheck, ModificationType currentModType) { if (itemToCheck.getModificationType() == NEW && currentModType.isDeleted()) { - transactionDataItems.remove(itemToCheck.getClass(), itemToCheck.getItemId()); + transactionDataItems.removeAndGet(itemToCheck.getClass(), itemToCheck.getItemId()); } else { itemToCheck.setModificationType(currentModType); } diff --git a/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF index ac6176f12f3..62ac47c898c 100644 --- a/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-Name: Java Code Content Assist Templates Plug-in (Incubation) Bundle-SymbolicName: org.eclipse.osee.framework.templates;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF index fce8d8fffa4..26c1466acc4 100644 --- a/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Branch Graph Plug-in Bundle-SymbolicName: org.eclipse.osee.framework.ui.branch.graph;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.gef, diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF index 61024e30f40..e93b62b6a12 100644 --- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.osee.framework.ui.skynet, org.eclipse.help, org.eclipse.core.filesystem -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF index 585d885c02f..1146385ef0e 100644 --- a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF @@ -31,4 +31,4 @@ Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.ui.product/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.product/META-INF/MANIFEST.MF index 990ff3e845f..1797d64853b 100644 --- a/plugins/org.eclipse.osee.framework.ui.product/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.product/META-INF/MANIFEST.MF @@ -8,4 +8,4 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.ui.intro Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF index 0aa2121440f..44d1bff70a2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Test Fragment Bundle-SymbolicName: org.eclipse.osee.framework.ui.skynet.test;singleton:=true Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.framework.ui.skynet -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.framework.ui.skynet Import-Package: com.lowagie.text.pdf;version="2.1.7", com.lowagie.text.rtf;version="2.1.7", diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index 6cd48520441..60acdb5451a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -180,7 +180,7 @@ Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", org.osgi.framework, org.osgi.service.packageadmin, org.osgi.service.prefs;version="1.1.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.framework.ui.skynet, org.eclipse.osee.framework.ui.skynet.Import, org.eclipse.osee.framework.ui.skynet.access, diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java index 284fa306356..f5bc5775944 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java @@ -19,7 +19,10 @@ import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; +import org.eclipse.swt.SWTError; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -68,18 +71,35 @@ public class DetailsFormSection extends ArtifactEditorFormSection { composite.setLayout(ALayout.getZeroMarginLayout()); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - browser = new Browser(composite, SWT.NONE); + composite.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); gd.widthHint = 200; gd.heightHint = 250; - browser.setLayoutData(gd); + + try { + browser = new Browser(composite, SWT.NONE); + browser.setLayoutData(gd); + } catch (SWTError e) { + // do nothing + } getSection().setClient(composite); toolkit.paintBordersFor(composite); sectionCreated = true; HelpUtil.setHelp(composite, OseeHelpContext.ARTIFACT_EDITOR__DETAILS); - HelpUtil.setHelp(browser, OseeHelpContext.ARTIFACT_EDITOR__DETAILS); + if (Widgets.isAccessible(browser)) { + HelpUtil.setHelp(browser, OseeHelpContext.ARTIFACT_EDITOR__DETAILS); + } } if (Widgets.isAccessible(browser)) { @@ -95,14 +115,6 @@ public class DetailsFormSection extends ArtifactEditorFormSection { } @Override - public void dispose() { - if (browser != null && !browser.isDisposed()) { - browser.dispose(); - } - super.dispose(); - } - - @Override public void refresh() { super.refresh(); createSection(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java index a2029a27017..b585907ac1a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java @@ -67,7 +67,8 @@ public class EmailGroupsData { HashCollection<Artifact, Artifact> userToGroupMap = new HashCollection<Artifact, Artifact>(); for (Artifact group : groups) { for (Artifact user : group.getRelatedArtifacts(CoreRelationTypes.Users_User)) { - if (user.getSoleAttributeValue(CoreAttributeTypes.Active)) { + Boolean isActive = user.getSoleAttributeValue(CoreAttributeTypes.Active); + if (isActive) { userToGroupMap.put(user, group); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BrowserComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BrowserComposite.java index f068a36f6ca..2d8361ca577 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BrowserComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BrowserComposite.java @@ -12,10 +12,13 @@ package org.eclipse.osee.framework.ui.skynet.panels; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.ProgressListener; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ToolBar; @@ -41,6 +44,16 @@ public class BrowserComposite extends Composite { gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH); previewBrowser.setLayoutData(gridData); + addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(previewBrowser)) { + previewBrowser.dispose(); + } + } + }); + this.toolBar = toolBar; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java index 70c244e15ea..b6b74489acd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java @@ -21,8 +21,11 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -83,6 +86,16 @@ public class ConfigurationDetails extends PreferencePage implements IWorkbenchPr browser.setLayout(new FillLayout()); browser.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL)); + composite.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); + Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java index d259d531aac..4fa793e246a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java @@ -19,9 +19,12 @@ import org.eclipse.osee.framework.skynet.core.utility.ConnectionHandler; import org.eclipse.osee.framework.skynet.core.utility.OseeInfo; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.osee.jdbc.JdbcStatement; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -75,6 +78,16 @@ public class DataSourceDetails extends PreferencePage implements IWorkbenchPrefe browser.setLayout(new FillLayout()); browser.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL)); + composite.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); + Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index ea8cb866087..888c81200d5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.events.SelectionAdapter; @@ -96,7 +97,10 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi xResultsComposite.setHtmlText(xResultPage.getManipulatedHtml(Arrays.asList(Manipulations.NONE))); HelpUtil.setHelp(xResultsComposite, OseeHelpContext.RESULTS_VIEW); - HelpUtil.setHelp(xResultsComposite.getBrowser(), OseeHelpContext.RESULTS_VIEW); + Browser browser = xResultsComposite.getBrowser(); + if (Widgets.isAccessible(browser)) { + HelpUtil.setHelp(browser, OseeHelpContext.RESULTS_VIEW); + } return comp; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java index 07648094d3b..2c54b1dca2f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java @@ -23,8 +23,12 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; +import org.eclipse.swt.SWTError; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; @@ -57,10 +61,24 @@ public class XResultsComposite extends Composite { parent.setLayout(layout); parent.setLayoutData(new GridData(GridData.FILL_BOTH)); - browser = new Browser(this, SWT.BORDER); - browser.addLocationListener(new XResultBrowserListener()); - browser.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL)); - browser.setMenu(getPopup(parent)); + try { + browser = new Browser(this, SWT.BORDER); + browser.addLocationListener(new XResultBrowserListener()); + browser.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL)); + browser.setMenu(getPopup(parent)); + } catch (SWTError e) { + // do nothing + } + + addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); } @@ -162,7 +180,7 @@ public class XResultsComposite extends Composite { public void setHtmlText(String htmlText, String title) { this.htmlText = htmlText; this.title = title; - if (browser != null && !browser.isDisposed()) { + if (Widgets.isAccessible(browser)) { browser.setText(htmlText); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java index 93291795073..9137ccf80f7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java @@ -19,9 +19,12 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.LocationListener; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; @@ -68,6 +71,17 @@ public class HtmlDialog extends MessageDialog { b.addLocationListener(listener); } b.setMenu(pageOverviewGetPopup()); + + c.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(b)) { + b.dispose(); + } + } + }); + return c; } diff --git a/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF index bda37b5687c..4356133cafe 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Export-Package: org.eclipse.osee.framework.ui.swt, org.eclipse.osee.framework.ui.swt.hex, org.eclipse.osee.framework.ui.swt.styledText Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.logging diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF index b11013c8ad6..2c0cf72d855 100644 --- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.ui.workspacebundleloader;singlet Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.framework.ui.workspacebundleloader.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, diff --git a/plugins/org.eclipse.osee.framework.ui.ws/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.ws/META-INF/MANIFEST.MF index c22bc59b901..226b52fc082 100644 --- a/plugins/org.eclipse.osee.framework.ui.ws/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.ws/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.osee.framework.ui.plugin, org.eclipse.ui.navigator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.framework.ui.ws Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.http.jetty.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.http.jetty.test/META-INF/MANIFEST.MF index 92af7179744..7d9f3b5d34c 100644 --- a/plugins/org.eclipse.osee.http.jetty.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.http.jetty.test/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Import-Package: javax.ws.rs;version="2.0.0", org.mockito;bundle-version="1.9.0", org.mockito.stubbing;bundle-version="1.9.0" Require-Bundle: org.hsqldb +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.http.jetty/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.http.jetty/META-INF/MANIFEST.MF index 85976bcb713..24f812ba114 100644 --- a/plugins/org.eclipse.osee.http.jetty/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.http.jetty/META-INF/MANIFEST.MF @@ -29,3 +29,4 @@ Import-Package: javax.servlet;version="[2.6.0,4.0.0)", org.osgi.framework;resolution:=optional Export-Package: org.eclipse.osee.http.jetty Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF index 1077f181676..b2cd1475191 100644 --- a/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.client.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE JAX-RS ClientTest (Incubation) Bundle-SymbolicName: org.eclipse.osee.jaxrs.client.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.jaxrs.client -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.eclipse.osee.http.jetty, org.junit, diff --git a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF index 2f0a747221d..0c1cecd9158 100644 --- a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF @@ -3,40 +3,39 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE JAX-RS Client (Incubation) Bundle-SymbolicName: org.eclipse.osee.jaxrs.client Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.cache;version="[11.0.0,15.0.0)", - javax.annotation;version="1.2.0", - javax.servlet;version="2.6.0", - javax.servlet.http;version="2.6.0", +Import-Package: com.google.common.base, + com.google.common.cache, + javax.servlet, + javax.servlet.http, javax.ws.rs;version="2.0.0", javax.ws.rs.client;version="2.0.0", javax.ws.rs.container;version="2.0.0", javax.ws.rs.core;version="2.0.0", javax.ws.rs.ext;version="2.0.0", org.apache.aries.blueprint;version="1.3.0", - org.apache.cxf.configuration.security;version="3.0.0", - org.apache.cxf.endpoint;version="3.0.0", - org.apache.cxf.feature;version="3.0.0", - org.apache.cxf.jaxrs;version="3.0.0", - org.apache.cxf.jaxrs.client;version="3.0.0", - org.apache.cxf.jaxrs.client.spec;version="3.0.0", - org.apache.cxf.jaxrs.ext;version="3.0.0", - org.apache.cxf.jaxrs.impl;version="3.0.0", - org.apache.cxf.rs.security.oauth2.client;version="3.0.0", - org.apache.cxf.rs.security.oauth2.common;version="3.0.0", - org.apache.cxf.rs.security.oauth2.filters;version="3.0.0", - org.apache.cxf.rs.security.oauth2.grants.code;version="3.0.0", - org.apache.cxf.rs.security.oauth2.grants.refresh;version="3.0.0", - org.apache.cxf.rs.security.oauth2.provider;version="3.0.0", - org.apache.cxf.rs.security.oauth2.services;version="3.0.0", - org.apache.cxf.rs.security.oauth2.utils;version="3.0.0", - org.apache.cxf.rs.security.oauth2.utils.crypto;version="3.0.0", - org.apache.cxf.transport.common.gzip;version="3.0.0", - org.apache.cxf.transport.http;version="3.0.0", - org.apache.cxf.transports.http.configuration;version="3.0.0", + org.apache.cxf.configuration.security, + org.apache.cxf.endpoint, + org.apache.cxf.feature, + org.apache.cxf.jaxrs, + org.apache.cxf.jaxrs.client, + org.apache.cxf.jaxrs.client.spec, + org.apache.cxf.jaxrs.ext, + org.apache.cxf.jaxrs.impl, + org.apache.cxf.rs.security.oauth2.client, + org.apache.cxf.rs.security.oauth2.common, + org.apache.cxf.rs.security.oauth2.filters, + org.apache.cxf.rs.security.oauth2.grants.code, + org.apache.cxf.rs.security.oauth2.grants.refresh, + org.apache.cxf.rs.security.oauth2.provider, + org.apache.cxf.rs.security.oauth2.services, + org.apache.cxf.rs.security.oauth2.utils, + org.apache.cxf.rs.security.oauth2.utils.crypto, + org.apache.cxf.transport.common.gzip, + org.apache.cxf.transport.http, + org.apache.cxf.transports.http.configuration, org.codehaus.jackson.jaxrs;version="1.9.13", org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java index ed251248738..606ef758a42 100644 --- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java @@ -28,7 +28,6 @@ import org.apache.cxf.transport.common.gzip.GZIPFeature; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.apache.cxf.transports.http.configuration.ProxyServerType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.jaxrs.JacksonFeature; @@ -80,20 +79,11 @@ public final class CxfJaxRsClientConfigurator implements JaxRsClientConfigurator @Override public void configureJaxRsRuntime() { - // Ensure CXF JAX-RS implementation is loaded + // Ensure CXF JAX-RS implementation is loaded RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl(); RuntimeDelegate.setInstance(runtimeDelegate); - try { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (classLoader == null) { - classLoader = getClass().getClassLoader(); - } - classLoader.loadClass(DEFAULT_JAXRS_CLIENT_BUILDER_IMPL); - } catch (ClassNotFoundException ex) { - throw new OseeCoreException(ex, "Unable to find JAX-RS Client Builder implementation - [%s]", - DEFAULT_JAXRS_CLIENT_BUILDER_IMPL); - } + new org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl(); System.setProperty(JAVAX_WS_RS_CLIENT_BUILDER_PROPERTY, DEFAULT_JAXRS_CLIENT_BUILDER_IMPL); } diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2ClientRequestFilter.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2ClientRequestFilter.java index f59d6de80e8..2cecbabd332 100644 --- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2ClientRequestFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2ClientRequestFilter.java @@ -12,9 +12,7 @@ package org.eclipse.osee.jaxrs.client.internal.ext; import static org.eclipse.osee.jaxrs.client.internal.ext.OAuth2Util.newException; import java.net.URI; -import javax.annotation.Priority; import javax.crypto.SecretKey; -import javax.ws.rs.Priorities; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.core.HttpHeaders; @@ -29,7 +27,6 @@ import org.eclipse.osee.jaxrs.client.JaxRsTokenStore; /** * @author Roberto E. Escobar */ -@Priority(Priorities.HEADER_DECORATOR) @Provider public class OAuth2ClientRequestFilter implements ClientRequestFilter { diff --git a/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF index 98c48a51577..462b87780a3 100644 --- a/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.jaxrs.server.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.jaxrs.server -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.hamcrest.core, org.junit, org.junit.rules, diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF index 44628af1980..a9e0927f59d 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE JAX-RS Server (Incubation) Bundle-SymbolicName: org.eclipse.osee.jaxrs.server Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Osee-Template: OSEE-INF/templates/*.html -Import-Package: com.google.common.cache;version="[11.0.0,15.0.0)", - com.google.common.io;version="[11.0.0,15.0.0)", - javax.annotation;version="1.2.0", - javax.annotation.security;version="1.2.0", - javax.servlet;version="2.6.0", - javax.servlet.http;version="2.6.0", +Import-Package: com.google.common.cache, + com.google.common.io, + javax.annotation, + javax.annotation.security, + javax.servlet, + javax.servlet.http, javax.ws.rs;version="2.0.0", javax.ws.rs.client;version="2.0.0", javax.ws.rs.container;version="2.0.0", diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java index 5523fdcc71b..679b282e769 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java @@ -16,9 +16,7 @@ import java.io.OutputStream; import java.net.URLConnection; import java.util.Date; import java.util.List; -import javax.annotation.Priority; import javax.servlet.ServletContext; -import javax.ws.rs.Priorities; import javax.ws.rs.WebApplicationException; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; @@ -40,7 +38,6 @@ import org.eclipse.osee.jaxrs.server.internal.JaxRsResourceManager.Resource; * @author Roberto E. Escobar */ @PreMatching -@Priority(Priorities.USER) @Provider public class JaxRsStaticResourceRequestFilter implements ContainerRequestFilter { diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java index 1e04ad143a6..c8c83305abc 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java @@ -12,9 +12,7 @@ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider; import static org.eclipse.osee.jaxrs.server.internal.security.oauth2.OAuthUtil.newAuthorizationRequiredResponse; import java.net.URI; -import javax.annotation.Priority; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.PreMatching; import javax.ws.rs.core.HttpHeaders; @@ -37,11 +35,10 @@ import org.eclipse.osee.logger.Log; * This filter allows for JAX-RS APIs to be shared between OAuth access * and when the resource owner accesses the API without using OAuth. * </pre> - * + * * @author Roberto E. Escobar */ @PreMatching -@Priority(Priorities.AUTHENTICATION) public class OAuth2RequestFilter extends OAuthRequestFilter { private final Log logger; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java index 7a826301239..35aed4eb494 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; @@ -26,7 +24,6 @@ import org.eclipse.osee.jaxrs.server.internal.JaxRsResourceManager.Resource; */ @Provider -@Priority(Priorities.AUTHORIZATION) public class OseeAuthorizingFilter extends SimpleAuthorizingFilter { private AbstractAuthorizingInInterceptor interceptor; diff --git a/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF index 51c1bd615d9..f693eac0313 100644 --- a/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF @@ -4,9 +4,9 @@ Bundle-Name: OSEE JAX-RS (Incubation) Bundle-SymbolicName: org.eclipse.osee.jaxrs Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Import-Package: javax.servlet;version="2.6.0", +Import-Package: javax.servlet, javax.ws.rs, javax.ws.rs.core, javax.ws.rs.ext, diff --git a/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF index 8c0cdde0f03..4374fa72de8 100644 --- a/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE JDBC Test - (Incubation) Bundle-SymbolicName: org.eclipse.osee.jdbc.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.jdbc -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.hsqldb, diff --git a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF index 0f390fbb494..60b56183751 100644 --- a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE JDBC - (Incubation) Bundle-SymbolicName: org.eclipse.osee.jdbc 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: org.apache.commons.dbcp, org.apache.commons.pool, diff --git a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/JdbcMigration.java b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/JdbcMigration.java index 8b9b1bfe74d..7880d9906cd 100644 --- a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/JdbcMigration.java +++ b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/JdbcMigration.java @@ -51,7 +51,11 @@ public class JdbcMigration { for (JdbcMigrationResource migration : migrations) { migration.addPlaceholders(placeholders); URL location = migration.getLocation(); - location = FileLocator.toFileURL(location); + try { + location = FileLocator.toFileURL(location); + } catch (Exception ex) { + // do nothing + } String formated = String.format(LOCATION_TEMPLATE, location.getFile()); allPaths.add(formated); } diff --git a/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF index 88c53c25531..79c413d65ec 100644 --- a/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.osee.logback.config Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: ch.qos.logback.classic;bundle-version="0.9.27" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF index a17afe8d521..3253598234d 100644 --- a/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Import-Package: org.eclipse.osee.framework.jdk.core.util, org.osgi.service.component, org.osgi.service.log, org.slf4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF index 7032db5b12c..e930fbe2617 100644 --- a/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: Osee Logger (Incubation) Bundle-SymbolicName: org.eclipse.osee.logger Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.logger diff --git a/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF index 9d21a2205a3..da146aa33a0 100644 --- a/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Mail API (Incubation) Bundle-SymbolicName: org.eclipse.osee.mail.api 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.mail;version="1.4.1", javax.mail.internet;version="1.4.1", diff --git a/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF index d42e11e5028..c2471ae510c 100644 --- a/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Mail Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.mail.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.mail -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF index d19d3b8ce2f..b0da6bf806f 100644 --- a/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Mail (Incubation) Bundle-SymbolicName: org.eclipse.osee.mail Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.activation, javax.mail;version="1.4.1", javax.mail.event;version="1.4.1", diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF index d47e30ea4f6..026bf7b7237 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE ORCS Account Admin Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.orcs.account.admin.test Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.account.admin Require-Bundle: org.junit, diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/pom.xml b/plugins/org.eclipse.osee.orcs.account.admin.test/pom.xml index beaf20743d6..4f8baaf3b6f 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/pom.xml @@ -23,23 +23,52 @@ <configuration> <testSuite>org.eclipse.osee.orcs.account.admin.test</testSuite> <testClass>org.eclipse.osee.orcs.account.admin.OrcsAccountTestSuite</testClass> - <dependencies> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.x.core.external.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.x.core.feature</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-feature</type> - <artifactId>org.eclipse.osee.orcs.feature</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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> diff --git a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF index 59f3f13b63d..d77ca14a491 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE ORCS Account Admin (Incubation) Bundle-SymbolicName: org.eclipse.osee.orcs.account.admin Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.io;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.io, com.google.gson, com.google.gson.reflect, org.eclipse.osee.account.admin, diff --git a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF index 675e91d24c2..29be18a3020 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.core.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.google.common.util.concurrent;version="[11.0.0,15.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.util.concurrent, org.eclipse.core.runtime, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.model.cache, diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF index 9e06fb5a97f..56efde6cf25 100644 --- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: OSEE Object Revision Control System Core Bundle-SymbolicName: org.eclipse.osee.orcs.core Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", - com.google.common.io;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.base, + com.google.common.collect, + com.google.common.io, org.codehaus.jackson;version="1.9.13", org.codehaus.jackson.map;version="1.9.13", org.codehaus.jackson.map.module;version="1.9.13", diff --git a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF index 12def32befd..9ec86b1b8d4 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Database Mock Bundle-SymbolicName: org.eclipse.osee.orcs.db.mock Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.annotation, diff --git a/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF index 401c70c57d1..0f8d6056ab4 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.db.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.db -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.orcs.db.test/pom.xml b/plugins/org.eclipse.osee.orcs.db.test/pom.xml index d9ad1499449..83ae38460ad 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.db.test/pom.xml @@ -23,108 +23,52 @@ <configuration> <testSuite>org.eclipse.osee.orcs.db.test</testSuite> <testClass>org.eclipse.osee.orcs.db.OrcsDbTestSuite</testClass> - <dependencies> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.event.osgi</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.executor.admin</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core.dsl.integration</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core.dsl</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.logging</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.resource.management</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.logger.slf4j</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.app</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.cm</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.common</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.ds</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.preferences</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.registry</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.security</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.util</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osgi.services</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osgi</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.hsqldb</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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> 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 92861e891f4..f1ce2477380 100644 --- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: OSEE ORCS Database Bundle-SymbolicName: org.eclipse.osee.orcs.db Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", - com.google.common.io;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.base, + com.google.common.collect, + com.google.common.io, org.eclipse.core.runtime, org.eclipse.osee.console.admin, org.eclipse.osee.executor.admin, diff --git a/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF index 5360db3cf1b..9720415f6e0 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest.client/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE ORCS Rest Client (Incubation) Bundle-SymbolicName: org.eclipse.osee.orcs.rest.client Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs;version="2.0.0", diff --git a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF index 1d761569a0b..0fd0a5a659c 100644 --- a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE ORCS Rest Model (Incubation) Bundle-SymbolicName: org.eclipse.osee.orcs.rest.model Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact Import-Package: javax.annotation.security;version="1.2.0", diff --git a/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF index a383cce4dd7..017d1258b36 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE ORCS Rest Test Bundle-SymbolicName: org.eclipse.osee.orcs.rest.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.orcs.rest -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF index 68f43e22386..8b2d6f5fa2c 100644 --- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: Osee ORCS Rest Bundle-SymbolicName: org.eclipse.osee.orcs.rest Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", +Import-Package: com.google.common.base, + com.google.common.collect, com.google.gson, javax.ws.rs, javax.ws.rs.core, diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl.tests/META-INF/MANIFEST.MF index 9838a47c289..2dd0de5da97 100644 --- a/plugins/org.eclipse.osee.orcs.script.dsl.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.script.dsl.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Import-Package: org.apache.log4j, org.junit.runner.notification;version="4.5.0", org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.orcs.script.dsl diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF index 7407dcb54b2..d1695d9b065 100644 --- a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE ORCS Script DSL UI Integration Bundle-SymbolicName: org.eclipse.osee.orcs.script.dsl.ui.integration;singleton:=true Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.osee.orcs.script.dsl.ui Import-Package: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl.ui/META-INF/MANIFEST.MF index e35673572a7..e8ab6df6a4e 100644 --- a/plugins/org.eclipse.osee.orcs.script.dsl.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Import-Package: org.apache.log4j, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.plugin.core.util, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.orcs.script.dsl.ui, org.eclipse.osee.orcs.script.dsl.ui.contentassist, org.eclipse.osee.orcs.script.dsl.ui.contentassist.antlr, diff --git a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF index 49af332a637..e5b33e3fb71 100644 --- a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: com.google.common.collect, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.orcs.script.dsl, org.eclipse.osee.orcs.script.dsl.conversion, org.eclipse.osee.orcs.script.dsl.formatting, diff --git a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF index c601cd98cdd..8a0eb854fc1 100644 --- a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", - com.google.common.collect;version="[11.0.0,15.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base, + com.google.common.collect, org.eclipse.osee.event, org.eclipse.osee.framework.core.services, org.eclipse.osee.jdbc, diff --git a/plugins/org.eclipse.osee.orcs.test/pom.xml b/plugins/org.eclipse.osee.orcs.test/pom.xml index e6efc92b347..5c599392e07 100644 --- a/plugins/org.eclipse.osee.orcs.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.test/pom.xml @@ -23,153 +23,47 @@ <configuration> <testSuite>org.eclipse.osee.orcs.test</testSuite> <testClass>org.eclipse.osee.orcs.OrcsIntegrationTestSuite</testClass> - <dependencies> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.console.admin</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.event.osgi</artifactId> - <version>0.0.0</version> - </dependency> - <!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.executor.admin</artifactId> - <version>0.0.0</version> - </dependency> --> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core.dsl.integration</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core.dsl</artifactId> - <version>0.0.0</version> - </dependency> - <!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core.model</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.core</artifactId> - <version>0.0.0</version> - </dependency> --> - <!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.jdk.core</artifactId> - <version>0.0.0</version> - </dependency> --> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.logging</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.framework.resource.management</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.logger.slf4j</artifactId> - <version>0.0.0</version> - </dependency> - <!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.logger</artifactId> - <version>0.0.0</version> - </dependency> --> -<!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.orcs.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.orcs.db.mock</artifactId> - <version>0.0.0</version> - </dependency> --> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.orcs.db</artifactId> - <version>0.0.0</version> - </dependency> - <!-- <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osee.orcs</artifactId> - <version>0.0.0</version> - </dependency> --> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.app</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.cm</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.common</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.ds</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.preferences</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.registry</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.security</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.util</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osgi.services</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osgi</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.hsqldb</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </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.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> diff --git a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF index 3b035b122da..76fff453c2b 100644 --- a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE Object Revision Control System Bundle-SymbolicName: org.eclipse.osee.orcs Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="2.1.0", org.eclipse.core.runtime, org.eclipse.osee.executor.admin, diff --git a/plugins/org.eclipse.osee.ote.client.msg/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.client.msg/META-INF/MANIFEST.MF index 1b8e28ebb67..8a36fa71a7c 100644 --- a/plugins/org.eclipse.osee.ote.client.msg/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.client.msg/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.osee.ote.messaging.dds, org.eclipse.osee.framework.plugin.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.client.msg, org.eclipse.osee.ote.client.msg.core, org.eclipse.osee.ote.client.msg.core.db diff --git a/plugins/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF index d12193c8587..e392fc4d572 100644 --- a/plugins/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.client/META-INF/MANIFEST.MF @@ -68,6 +68,6 @@ Import-Package: net.jini.activation, org.osgi.util.tracker Export-Package: org.eclipse.osee.ote.service, org.eclipse.osee.ote.service.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.osee.framework.logging, org.eclipse.osee.framework.messaging diff --git a/plugins/org.eclipse.osee.ote.connection.jini/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.connection.jini/META-INF/MANIFEST.MF index 3ff89a46543..6bd4515f212 100644 --- a/plugins/org.eclipse.osee.ote.connection.jini/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.connection.jini/META-INF/MANIFEST.MF @@ -15,4 +15,4 @@ Import-Package: org.eclipse.osee.connection.service, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.network Export-Package: org.eclipse.osee.ote.connection.jini -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.ote.connection.service.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.connection.service.test/META-INF/MANIFEST.MF index c7fad54d70d..51d0ab1df24 100644 --- a/plugins/org.eclipse.osee.ote.connection.service.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.connection.service.test/META-INF/MANIFEST.MF @@ -12,4 +12,4 @@ Import-Package: org.eclipse.osee.connection.service, Require-Bundle: net.jini, org.eclipse.osee.ote.connection.jini, org.eclipse.osee.framework.jdk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.ote.connection.service/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.connection.service/META-INF/MANIFEST.MF index fc526f6ad1b..be0b885cebe 100644 --- a/plugins/org.eclipse.osee.ote.connection.service/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.connection.service/META-INF/MANIFEST.MF @@ -12,4 +12,4 @@ Import-Package: org.eclipse.osee.framework.jdk.core.util, org.osgi.framework, org.osgi.util.tracker Export-Package: org.eclipse.osee.connection.service -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.osee.ote.container/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.container/META-INF/MANIFEST.MF index ec7e49440e7..4302c7cdb3b 100644 --- a/plugins/org.eclipse.osee.ote.container/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.container/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.osee.ote.runtimeManager, org.eclipse.osee.framework.jdk.core, org.eclipse.osee.ote.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.ui.workspacebundleloader Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.core.test/META-INF/MANIFEST.MF index 73cf0eba9d8..b35dc2eaf90 100644 --- a/plugins/org.eclipse.osee.ote.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.core.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ote.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.equinox.ds Export-Package: org.eclipse.osee.ote.core.framework diff --git a/plugins/org.eclipse.osee.ote.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.core/META-INF/MANIFEST.MF index c021cea6bb1..c4de43fe9f8 100644 --- a/plugins/org.eclipse.osee.ote.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.core/META-INF/MANIFEST.MF @@ -61,7 +61,7 @@ Require-Bundle: org.eclipse.osee.framework.jdk.core, org.eclipse.osee.ote.connection.service, net.jini;bundle-version="2.1.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.osee.ote.core.internal.Activator Import-Package: javax.xml.parsers, org.apache.xml.serialize, diff --git a/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF index ae91932106f..819dbb50c10 100644 --- a/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: org.eclipse.osee.ote.define, org.eclipse.osee.ote.define.parser.handlers, org.eclipse.osee.ote.define.utilities Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.lang;version="2.4.0", org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.ote.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.help.ui.test/META-INF/MANIFEST.MF index 1c1adde38cb..84743b8cc8e 100644 --- a/plugins/org.eclipse.osee.ote.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.help.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.help.ui.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ote.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.ote.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.help.ui/META-INF/MANIFEST.MF index 7452019a1fe..9de00b9b14a 100644 --- a/plugins/org.eclipse.osee.ote.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.help.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE OTE Help (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.help.ui;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.ote.help.ui Import-Package: org.eclipse.osee.framework.core.data diff --git a/plugins/org.eclipse.osee.ote.io/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.io/META-INF/MANIFEST.MF index bc3a6968414..b4b77824d41 100644 --- a/plugins/org.eclipse.osee.ote.io/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.io/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OTE IO (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.io;singleton:=true Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.logging, org.eclipse.osee.ote.properties, org.osgi.framework diff --git a/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF index d81e7b47da6..d65e9c0e506 100644 --- a/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.jms/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OTE JMS (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.jms Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.connection.service, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.ote.master.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master.rest.client/META-INF/MANIFEST.MF index b54df17bd58..2a3763e9ed2 100644 --- a/plugins/org.eclipse.osee.ote.master.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master.rest.client/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.master.rest.client Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.inject, com.google.inject.binder, com.google.inject.matcher, diff --git a/plugins/org.eclipse.osee.ote.master.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master.rest.model/META-INF/MANIFEST.MF index 66fa885e647..1ffbf963d98 100644 --- a/plugins/org.eclipse.osee.ote.master.rest.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master.rest.model/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.ote.master.rest.model Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.master.rest.model Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.master.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master.rest.test/META-INF/MANIFEST.MF index d898a1f38f8..cc46520d7ee 100644 --- a/plugins/org.eclipse.osee.ote.master.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master.rest.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OTE Master Rest Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.master.rest.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ote.master.rest.client;bundle-version="0.11.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.apache.felix.gogo.command, org.apache.felix.gogo.runtime, diff --git a/plugins/org.eclipse.osee.ote.master.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master.rest/META-INF/MANIFEST.MF index 91033e3fe22..1a4004e9a14 100644 --- a/plugins/org.eclipse.osee.ote.master.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master.rest/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.master.rest;singleton:=true Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.ws.rs, javax.ws.rs.core, javax.ws.rs.ext, diff --git a/plugins/org.eclipse.osee.ote.master.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master.test/META-INF/MANIFEST.MF index 3954537cf06..6ac8aa0828c 100644 --- a/plugins/org.eclipse.osee.ote.master.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master.test/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: OTE Master Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.master.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ote.master;bundle-version="0.11.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.10.0" Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.master/META-INF/MANIFEST.MF index 8897e08cb28..a343c7e06fd 100644 --- a/plugins/org.eclipse.osee.ote.master/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.master/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.master Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.master Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.messaging.dds/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.messaging.dds/META-INF/MANIFEST.MF index 1237deb9be5..0109df98648 100644 --- a/plugins/org.eclipse.osee.ote.messaging.dds/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.messaging.dds/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Export-Package: org.eclipse.osee.ote.messaging.dds, org.eclipse.osee.ote.messaging.dds.test, org.eclipse.osee.ote.messaging.dds.test.data Require-Bundle: org.eclipse.osee.framework.jdk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.ote.model.manager/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.model.manager/META-INF/MANIFEST.MF index 632c867b201..4237d66782d 100644 --- a/plugins/org.eclipse.osee.ote.model.manager/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.model.manager/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OTE Model Manager (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.model.manager;singleton:=true 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: org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.logging, diff --git a/plugins/org.eclipse.osee.ote.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.properties/META-INF/MANIFEST.MF index 595c7fcf0ae..34d5d82e7e2 100644 --- a/plugins/org.eclipse.osee.ote.properties/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.properties/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: OTE Properties Bundle-SymbolicName: org.eclipse.osee.ote.properties Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.properties diff --git a/plugins/org.eclipse.osee.ote.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.rest.client/META-INF/MANIFEST.MF index 28617b8a118..32f238a66a7 100644 --- a/plugins/org.eclipse.osee.ote.rest.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.rest.client/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE OTE Rest Client (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.rest.client Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs;version="2.0.0", diff --git a/plugins/org.eclipse.osee.ote.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.rest.model/META-INF/MANIFEST.MF index b75b7d899d4..a34a67ef75c 100644 --- a/plugins/org.eclipse.osee.ote.rest.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.rest.model/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE OTE Rest Model (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.rest.model Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.rest.model Import-Package: javax.xml.bind.annotation, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.ote.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.rest/META-INF/MANIFEST.MF index d483e786495..d030a650792 100644 --- a/plugins/org.eclipse.osee.ote.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.rest/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OSEE OTE Rest (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.rest Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs, javax.ws.rs.core, diff --git a/plugins/org.eclipse.osee.ote.runtimeManager/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.runtimeManager/META-INF/MANIFEST.MF index d5c558c06cf..0efe759292f 100644 --- a/plugins/org.eclipse.osee.ote.runtimeManager/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.runtimeManager/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OTE Runtime Manager Plug-in (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.runtimeManager;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Activator: org.eclipse.osee.ote.runtimemanager.RuntimeManager -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, diff --git a/plugins/org.eclipse.osee.ote.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.server/META-INF/MANIFEST.MF index 17d1938d6f8..330c8dcf74d 100644 --- a/plugins/org.eclipse.osee.ote.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.server/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: OTE Server Launching Plug-in (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.server;singleton:=true Bundle-Version: 0.22.0.qualifier Bundle-Description: OTE Server -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.apache.felix.service.command;status=provisional;version="0.8.0", org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.ote.ui.builder/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.builder/META-INF/MANIFEST.MF index 2211ef2990e..0b5c1eae29c 100644 --- a/plugins/org.eclipse.osee.ote.ui.builder/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.ui.builder/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.osee.ote.ui.builder.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.jdt.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.resources, org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF index 3841cdfdd78..61c5842ff48 100644 --- a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Export-Package: org.eclipse.osee.ote.ui.define, org.eclipse.osee.ote.ui.define.viewers.data, org.eclipse.osee.ote.ui.define.views Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.lowagie.text;version="2.1.7", org.apache.commons.lang;version="2.4.0", org.eclipse.osee.framework.access, diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java index c151492ad4c..793b255363f 100644 --- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java +++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java @@ -15,10 +15,13 @@ import java.util.logging.Level; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.FontManager; +import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.osee.ote.ui.define.OteUiDefinePlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.custom.StackLayout; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -59,6 +62,16 @@ public class PreviewPanel extends Composite { stackedComposite.setLayout(stackLayout); stackedComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + stackedComposite.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + if (Widgets.isAccessible(browser)) { + browser.dispose(); + } + } + }); + createBrowserArea(stackedComposite); createPreviewNotAllowed(stackedComposite); } diff --git a/plugins/org.eclipse.osee.ote.ui.markers/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.markers/META-INF/MANIFEST.MF index 51e21acc7fc..ddca0075df4 100644 --- a/plugins/org.eclipse.osee.ote.ui.markers/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.ui.markers/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.osee.framework.ui.plugin Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.ote.ui.markers -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.ui.ws, diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.test.manager/META-INF/MANIFEST.MF index 5b818f23084..46a710eee45 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/META-INF/MANIFEST.MF @@ -44,7 +44,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.osee.ote.runtimeManager, net.jini;bundle-version="2.1.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.xml.serialize, org.eclipse.jdt.core, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF index 3051a00abd6..d976cc0f9d0 100644 --- a/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.ote.ui, org.eclipse.osee.ote.ui.navigate -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, diff --git a/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF index 9dee4149f96..120994a186d 100644 --- a/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: OTE Version Git Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.version.git.test Bundle-Version: 0.22.0.qualifier Fragment-Host: org.eclipse.osee.ote.version.git;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.11.0" Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.version.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version.git/META-INF/MANIFEST.MF index 327a0e61b59..53265d6d4d3 100644 --- a/plugins/org.eclipse.osee.ote.version.git/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.version.git/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OTE Version Git (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.version.git Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.errors, diff --git a/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF index 9cbb6dbdbfe..b32f48a0264 100644 --- a/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.version.svn Bundle-Version: 0.22.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources, org.eclipse.osee.framework.logging, org.eclipse.osee.ote.version, diff --git a/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java b/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java index 1ba11c734c0..6cd50ee6054 100644 --- a/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java +++ b/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.ote.version.FileVersion; import org.eclipse.osee.ote.version.FileVersionInformationProvider; import org.eclipse.team.svn.core.connector.ISVNConnector; -import org.eclipse.team.svn.core.connector.ISVNConnector.Depth; +import org.eclipse.team.svn.core.connector.SVNDepth; import org.eclipse.team.svn.core.connector.SVNEntryInfo; import org.eclipse.team.svn.core.connector.SVNEntryRevisionReference; import org.eclipse.team.svn.core.extension.CoreExtensionsManager; @@ -29,36 +29,36 @@ import org.eclipse.team.svn.core.utility.SVNUtility; public class SvnVersionProvider implements FileVersionInformationProvider { - protected boolean isSvn(File file) { File svn = new File(file, SVNUtility.getSVNFolderName()); return svn.exists(); } - + @Override public void getFileVersions(List<File> scriptFiles, Map<File, FileVersion> versions) { IProject[] workspaceProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); ScriptToProject collection = new ScriptToProject(workspaceProjects); - - for(File scriptFile:scriptFiles){ + + for (File scriptFile : scriptFiles) { collection.add(scriptFile); } - ISVNConnector proxy = CoreExtensionsManager.instance().getSVNConnectorFactory().newInstance(); - for (String projectName : collection.getProjectsSet()) { + ISVNConnector proxy = CoreExtensionsManager.instance().getSVNConnectorFactory().createConnector(); + for (String projectName : collection.getProjectsSet()) { try { - SVNEntryInfo []st = SVNUtility.info(proxy, new SVNEntryRevisionReference(projectName), Depth.INFINITY, new SVNNullProgressMonitor()); + SVNEntryInfo[] st = + SVNUtility.info(proxy, new SVNEntryRevisionReference(projectName), SVNDepth.INFINITY, + new SVNNullProgressMonitor()); for (SVNEntryInfo entry : st) { String svnEntryPath = entry.path; String itemToMatch = svnEntryPath.substring(svnEntryPath.lastIndexOf("/") + 1); File scriptFile = collection.getScriptFileMatch(projectName, itemToMatch); - if(scriptFile != null){ + if (scriptFile != null) { versions.put(scriptFile, new SvnFileVersion(entry)); } } - } - catch (Exception ex) { + } catch (Exception ex) { OseeLog.logf(getClass(), Level.SEVERE, "SVNConnectorException while retrieving script SVN info ", ex); } } diff --git a/plugins/org.eclipse.osee.ote.version/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version/META-INF/MANIFEST.MF index ce72afb0a4a..71c79827d9e 100644 --- a/plugins/org.eclipse.osee.ote.version/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.version/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OTE Version (Incubation) Bundle-SymbolicName: org.eclipse.osee.ote.version Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.ote.version Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml index cba2d893771..8b80c691d06 100644 --- a/plugins/org.eclipse.osee.parent/pom.xml +++ b/plugins/org.eclipse.osee.parent/pom.xml @@ -21,8 +21,8 @@ <git-repo-root>file:../../..</git-repo-root> <build-alias>-DEV</build-alias> - <tycho-version>0.19.0</tycho-version> - <tycho-extras-version>0.19.0</tycho-extras-version> + <tycho-version>0.22.0</tycho-version> + <tycho-extras-version>0.22.0</tycho-extras-version> <maven-antrun-version>1.6</maven-antrun-version> <ant-contrib-version>1.0b3</ant-contrib-version> @@ -49,7 +49,8 @@ <jasmine-version>1.3.1.0</jasmine-version> - <platform-version-name>kepler</platform-version-name> + <platform-version-name>luna</platform-version-name> +<!-- <orbit-version>R20150124073747</orbit-version> --> <orbit-version>R20130517111416</orbit-version> <xtext-version>2.0.0</xtext-version> <subversive-version>1.0</subversive-version> @@ -62,6 +63,9 @@ <osee-create-help-docs>true</osee-create-help-docs> <osee-application-server-launch-ant>../../plugins/org.eclipse.osee.parent/tools/osee-application-server.xml</osee-application-server-launch-ant> + +<!-- <cbi-jdt-repo.url>http://repo.eclipse.org/content/repositories/eclipse-releases/</cbi-jdt-repo.url> --> +<!-- <cbi-jdt-version>3.10.0.v20140604-1726</cbi-jdt-version> --> </properties> <licenses> @@ -100,7 +104,18 @@ <url>${itemis-site}</url> </repository> </repositories> - +<!-- <pluginRepositories> --> +<!-- <pluginRepository> --> +<!-- <id>cbi-jdt</id> --> +<!-- <url>${cbi-jdt-repo.url}</url> --> +<!-- <releases> --> +<!-- <enabled>true</enabled> --> +<!-- </releases> --> +<!-- <snapshots> --> +<!-- <enabled>true</enabled> --> +<!-- </snapshots> --> +<!-- </pluginRepository> --> +<!-- </pluginRepositories> --> <build> <sourceDirectory>src</sourceDirectory> <plugins> @@ -257,10 +272,17 @@ <artifactId>tycho-compiler-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.8</source> + <target>1.8</target> <encoding>UTF-8</encoding> </configuration> +<!-- <dependencies> --> +<!-- <dependency> --> +<!-- <groupId>org.eclipse.jdt</groupId> --> +<!-- <artifactId>org.eclipse.jdt.core</artifactId> --> +<!-- <version>${cbi-jdt-version}</version> --> +<!-- </dependency> --> +<!-- </dependencies> --> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> diff --git a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF index 3d41232a226..5ae5b67eb19 100644 --- a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Test Support Util Plug-in Bundle-SymbolicName: org.eclipse.osee.support.test.util Bundle-Version: 0.22.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.osee.support.test.util Import-Package: org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.exception, diff --git a/plugins/org.eclipse.osee.template.engine.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.template.engine.test/META-INF/MANIFEST.MF index 5b78e419665..eb77b1ee7ec 100644 --- a/plugins/org.eclipse.osee.template.engine.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.template.engine.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.template.engine.test Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.template.engine -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.hamcrest.core, org.junit, org.junit.runner, diff --git a/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF index 931880f42b9..1009ca0a06c 100644 --- a/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Template Engine (Incubation) Bundle-SymbolicName: org.eclipse.osee.template.engine Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.annotation.security;version="1.2.0", javax.ws.rs;version="2.0.0", javax.ws.rs.core;version="2.0.0", diff --git a/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF index d72461d7085..9117fce8599 100644 --- a/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE VectorCAST (Incubation) Bundle-SymbolicName: org.eclipse.osee.vcast Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.jdk.core.type, diff --git a/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF index 8aeb3ffedd9..d143ac28e54 100644 --- a/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSEE Web UI (Incubation) Bundle-SymbolicName: org.eclipse.osee.web.ui Bundle-Version: 0.22.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Open System Engineering Environment Osee-JaxRs-Resource: /src/*;path=/;secure=false diff --git a/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF index b635b3695a8..3f8901b321c 100644 --- a/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: OSEE X Server Application Bundle-SymbolicName: org.eclipse.osee.x.server.application Bundle-Version: 0.22.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.equinox.app 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 84142d4b751..66e314baa2a 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 bc6044a78ec..ed335137078 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> |