Merge branch 'dev' of https://git.eclipse.org/r/osee/org.eclipse.osee into java11 Change-Id: Ia331ad598b92f2d20ace6b290d3f0098fa208fb5
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml index 283eec3..fc164ab 100644 --- a/features/org.eclipse.osee.core.server.external.feature/feature.xml +++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -24,17 +24,108 @@ <includes id="org.eclipse.osee.disposition.feature" version="0.0.0"/> - + <includes id="org.eclipse.jgit" - version="5.0.0"/> + version="5.0.0.201806131550-r"/> <plugin + id="com.sun.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javax.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> +<plugin + id="javax.xml.ws" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + +<plugin + id="jakarta.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + +<plugin + id="javax.xml.stream" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="javax.xml.rpc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="javax.xml.soap" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javassist" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="io.github.classgraph" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.egit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + + <plugin + id="org.eclipse.jgit" + download-size="0" + install-size="0" + version="5.0.0.201806131550-r" + unpack="false"/> + + + <plugin + id="javax.transaction" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="javax.activation" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.apache.cxf.cxf-rt-rs-service-description" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + <plugin id="org.postgresql.driver" @@ -47,7 +138,7 @@ id="org.objectweb.asm" download-size="0" install-size="0" - version="6.1.1" + version="8.0.1.v20200420-1007" unpack="false"/> <plugin @@ -275,7 +366,7 @@ unpack="false"/> <plugin - id="javax.mail.glassfish" + id="javax.mail" download-size="0" install-size="0" version="0.0.0" @@ -324,13 +415,6 @@ unpack="false"/> <plugin - id="javax.activation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.common" download-size="0" install-size="0" @@ -408,13 +492,6 @@ unpack="false"/> <plugin - id="org.eclipse.equinox.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.apache.commons.logging" download-size="0" install-size="0" @@ -489,7 +566,7 @@ id="com.google.guava" download-size="0" install-size="0" - version="0.0.0" + version="27.1.0.v20190517-1946" unpack="false"/> <plugin @@ -503,49 +580,49 @@ id="org.eclipse.jetty.http" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.io" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.security" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.server" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.servlet" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.util" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.util.ajax" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin @@ -608,7 +685,7 @@ id="org.antlr.runtime" download-size="0" install-size="0" - version="3.2.0" + version="0.0.0" unpack="false"/> <plugin @@ -645,7 +722,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.eclipse.equinox.cm" download-size="0" @@ -653,8 +730,6 @@ version="0.0.0" unpack="false"/> - - <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" download-size="0" @@ -760,9 +835,22 @@ install-size="0" version="0.0.0" unpack="false"/> - +<!-- <plugin - id="org.eclipse.osee.server.application" + id="org.eclipse.xpand" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> +--> + <plugin + id="com.google.gson" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.eclipse.osee.server.application" download-size="0" install-size="0" version="0.0.0" @@ -868,13 +956,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.mwe2.runtime" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.emf.codegen" download-size="0" install-size="0" @@ -903,13 +984,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.mwe.utils" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.emf.edit" download-size="0" install-size="0" @@ -939,13 +1013,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.mwe.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osee.account.admin" download-size="0" install-size="0" @@ -1156,10 +1223,5 @@ version="0.0.0" fragment="true" unpack="false"/> - <plugin - id="org.eclipse.osee.mim" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + </feature>
diff --git a/features/org.eclipse.osee.core.server.external.feature/pom.xml b/features/org.eclipse.osee.core.server.external.feature/pom.xml index c5f9cae..d21f871 100644 --- a/features/org.eclipse.osee.core.server.external.feature/pom.xml +++ b/features/org.eclipse.osee.core.server.external.feature/pom.xml
@@ -25,16 +25,30 @@ </goals> <configuration> <excludes> + <plugin id="org.eclipse.osgi.services" /> + <plugin id="com.google.gson" /> + <plugin id="javax.activation" /> <plugin id="ch.qos.logback.slf4j" /> <plugin id="org.antlr.runtime" /> + <plugin id="javax.xml.ws" /> + <plugin id="javax.xml.rpc" /> + <plugin id="javax.xml.soap" /> <plugin id="org.apache.cxf.cxf-core" /> + <plugin id="javax.transaction" /> <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" /> <plugin id="org.apache.cxf.cxf-rt-security" /> <plugin id="org.apache.cxf.cxf-rt-transports-http" /> <plugin id="org.apache.cxf.cxf-rt-rs-client" /> - <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" /> + <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" /> <plugin id="javaewah" /> - <plugin id="org.antlr.runtime" /> + <plugin id="com.google.guava" /> + <plugin id="com.fasterxml.jackson.core.jackson-core" /> + <plugin id="com.fasterxml.jackson.core.jackson-annotations" /> + <plugin id="com.fasterxml.jackson.core.jackson-databind" /> + <plugin id="ch.qos.logback.classic" /> + <plugin id="ch.qos.logback.core" /> + <plugin id="org.eclipse.equinox.ds" /> + <plugin id="javax.mail" /> <plugin id="org.apache.ws.xmlschema.core" /> <plugin id="org.postgresql.driver" /> <plugin id="org.eclipse.egit" />
diff --git a/features/org.eclipse.osee.core.server.feature/feature.xml b/features/org.eclipse.osee.core.server.feature/feature.xml index 9d0c624..28fa00c 100644 --- a/features/org.eclipse.osee.core.server.feature/feature.xml +++ b/features/org.eclipse.osee.core.server.feature/feature.xml
@@ -250,13 +250,6 @@ unpack="false"/> <plugin - id="javax.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.apache.commons.codec" download-size="0" install-size="0" @@ -702,42 +695,42 @@ id="org.eclipse.jetty.http" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.jetty.io" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.jetty.security" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.jetty.server" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.jetty.servlet" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.jetty.util" download-size="0" install-size="0" - version="9.4.39" + version="0.0.0" unpack="false"/> <plugin @@ -783,13 +776,6 @@ unpack="false"/> <plugin - id="org.eclipse.equinox.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.event" download-size="0" install-size="0" @@ -880,7 +866,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.apache.cxf.core.config" download-size="0"
diff --git a/features/org.eclipse.osee.core.ui.feature/feature.xml b/features/org.eclipse.osee.core.ui.feature/feature.xml index ba70c6e..7dd49d3 100644 --- a/features/org.eclipse.osee.core.ui.feature/feature.xml +++ b/features/org.eclipse.osee.core.ui.feature/feature.xml
@@ -18,7 +18,6 @@ </license> <requires> - <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="com.jcraft.jsch"/> <import plugin="org.apache.commons.lang"/> @@ -27,24 +26,63 @@ <import plugin="org.eclipse.osee.framework.logging"/> <import plugin="org.eclipse.osee.framework.plugin.core"/> <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.ui.editors"/> - <import plugin="org.eclipse.ui.console"/> - <import plugin="org.eclipse.ui.forms"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.jdt.core"/> <import plugin="org.eclipse.jdt.ui"/> <import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.jface"/> - <import plugin="org.eclipse.ui.forms" version="3.4.1" match="greaterOrEqual"/> <import plugin="org.eclipse.core.commands"/> <import plugin="org.eclipse.core.jobs"/> <import plugin="org.eclipse.osgi"/> <import feature="org.eclipse.osee.core.feature" version="1.0.0.qualifier"/> </requires> + + <plugin + id="org.eclipse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.ide" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + + <plugin + id="org.eclipse.ui.workbench.texteditor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + + <plugin + id="org.eclipse.ui.editors" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.console" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.forms" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin id="org.eclipse.osee.framework.ui.plugin" download-size="0"
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml index 630db09..ffeb743 100644 --- a/features/org.eclipse.osee.dep.feature/feature.xml +++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -16,6 +16,20 @@ <license url="%licenseURL"> %license </license> +<!-- + <includes + id="org.polarion.eclipse.team.svn.connector" + version="0.0.0"/> + + <includes + id="org.polarion.eclipse.team.svn.connector.svnkit18" + version="0.0.0"/> +--> + + + <includes + id="org.eclipse.equinox.core.feature" + version="0.0.0"/> <includes id="edu.umd.cs.findbugs.plugin.eclipse" @@ -26,7 +40,7 @@ version="0.0.0"/> <includes - id="org.eclipse.wst.xml_userdoc.feature" + id="org.eclipse.wst.xml_userdoc.feature" version="0.0.0"/> <includes @@ -44,11 +58,7 @@ <includes id="org.eclipse.wst.jsdt.feature" version="0.0.0"/> - - <includes - id="org.eclipse.egit.mylyn" - version="5.0.0"/> - + <includes id="org.eclipse.wst.server_userdoc.feature" version="0.0.0"/> @@ -95,12 +105,20 @@ <includes id="org.eclipse.jgit.lfs" - version="5.0.0"/> + version="5.0.0.201806131550-r"/> <includes id="org.eclipse.jgit.http.apache" - version="5.0.0"/> - + version="5.0.0.201806131550-r"/> + + <includes + id="org.eclipse.jgit" + version="5.0.0.201806131550-r"/> + + <includes + id="org.eclipse.egit" + version="5.0.0.201806131550-r"/> + <includes id="org.eclipse.gef" version="0.0.0"/> @@ -112,11 +130,7 @@ <includes id="org.eclipse.equinox.sdk" version="0.0.0"/> - - <includes - id="org.eclipse.egit" - version="5.0.0"/> - + <includes id="org.eclipse.emf" version="0.0.0"/> @@ -146,10 +160,6 @@ version="0.0.0"/> <includes - id="org.eclipse.emf.compare" - version="0.0.0"/> - - <includes id="org.eclipse.emf.converter" version="0.0.0"/> @@ -202,14 +212,6 @@ version="0.0.0"/> <includes - id="org.eclipse.emf.mwe2.language.sdk" - version="0.0.0"/> - - <includes - id="org.eclipse.emf.mwe2.runtime.sdk" - version="0.0.0"/> - - <includes id="org.eclipse.emf.transaction" version="0.0.0"/> @@ -225,7 +227,6 @@ id="org.eclipse.core.runtime.feature" version="0.0.0"/> - <includes id="org.eclipse.help" version="0.0.0"/> @@ -238,8 +239,6 @@ id="org.eclipse.rcp" version="0.0.0"/> - - <includes id="org.eclipse.nebula.widgets.ganttchart.feature" version="0.0.0"/> @@ -272,19 +271,12 @@ id="org.eclipse.equinox.p2.sdk" version="0.0.0"/> - <includes - id="org.eclipse.equinox.core.feature" - version="0.0.0"/> <includes id="org.eclipse.equinox.core.sdk" version="0.0.0"/> <includes - id="org.eclipse.equinox.p2.user.ui" - version="0.0.0"/> - - <includes id="org.eclipse.equinox.compendium.sdk" version="0.0.0"/> @@ -325,6 +317,10 @@ version="0.0.0"/> <includes + id="org.eclipse.ecf.filetransfer.httpclient45.feature" + version="0.0.0"/> + + <includes id="org.eclipse.ecf.filetransfer.feature.source" version="0.0.0"/> @@ -351,50 +347,13 @@ <includes id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="0.0.0"/> - - <includes - id="org.eclipse.papyrus.sdk.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.jgit" - version="5.0.0"/> - - <includes - id="org.eclipse.cdt" - version="0.0.0"/> - - <includes - id="org.eclipse.cdt.sdk" - version="0.0.0"/> - - <includes - id="org.eclipse.mylyn.commons.sdk" - version="0.0.0"/> - - <includes - id="org.eclipse.mylyn.commons.identity" - version="0.0.0"/> - - <includes - id="org.eclipse.mylyn.commons.notifications" - version="0.0.0"/> - - <includes - id="org.eclipse.mylyn.commons.repositories" - version="0.0.0"/> - - <includes + + <includes id="org.eclipse.launchbar" version="0.0.0"/> - <includes - id="org.polarion.eclipse.team.svn.connector" - version="0.0.0"/> - <includes - id="org.polarion.eclipse.team.svn.connector.svnkit18" - version="0.0.0"/> + <includes id="org.eclipse.eclemma.feature" @@ -405,12 +364,9 @@ version="0.0.0" /> <requires> - <import plugin="org.eclipse.osgi.services"/> <import plugin="org.slf4j.api"/> <import plugin="org.apache.sshd.core"/> - <import plugin="javax.xml"/> <import plugin="javax.servlet" /> - <import plugin="org.eclipse.osgi"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.core.jobs"/> <import plugin="org.eclipse.core.contenttype"/> @@ -421,60 +377,134 @@ <import plugin="org.eclipse.equinox.common"/> <import plugin="org.eclipse.osgi.util" /> <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/> - <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/> - <import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/> + <import plugin="org.apache.commons.pool" version="0.0.0" match="compatible"/> <import plugin="com.lowagie.text" version="2.0.0" match="compatible"/> </requires> <plugin + id="org.eclipse.jgit" + download-size="0" + install-size="0" + version="5.0.0.201806131550-r" + unpack="false"/> + + <plugin + id="javax.transaction" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.bouncycastle.bcpg" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="org.bouncycastle.bcpkix" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="org.bouncycastle.bcprov" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin id="org.eclipse.jetty.io" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" + unpack="false" /> + + <plugin + id="org.apache.commons.compress" + download-size="0" + install-size="0" + version="0.0.0" unpack="false" /> + <plugin + id="jakarta.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="javaewah" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + <plugin id="org.eclipse.jetty.http" download-size="0" install-size="0" - version="9.4.39" - unpack="false" /> - + version="9.4.39.v20210325" + unpack="false" /> + <plugin id="org.eclipse.jetty.security" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false" /> <plugin id="org.eclipse.jetty.server" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false" /> <plugin id="org.eclipse.jetty.servlet" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false" /> <plugin id="org.eclipse.jetty.util" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false" /> - + + <plugin + id="org.apache.sshd.sftp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="net.i2p.crypto.eddsa" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + <plugin id="net.bytebuddy.byte-buddy" download-size="0" install-size="0" version="0.0.0" unpack="false" /> - +<plugin + id="javax.xml.ws" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> <plugin id="net.bytebuddy.byte-buddy-agent" download-size="0" @@ -495,7 +525,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.apache.ws.xmlschema.core" download-size="0" @@ -523,40 +553,47 @@ install-size="0" version="0.0.0" unpack="false" /> + + <plugin + id="javax.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> <plugin id="com.fasterxml.jackson.core.jackson-core" download-size="0" install-size="0" - version="2.9.2" + version="0.0.0" unpack="false" /> <plugin id="com.fasterxml.jackson.core.jackson-annotations" download-size="0" install-size="0" - version="2.9.2" + version="0.0.0" unpack="false"/> <plugin id="com.fasterxml.jackson.core.jackson-databind" download-size="0" install-size="0" - version="2.9.2" + version="0.0.0" unpack="false"/> <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" download-size="0" install-size="0" - version="2.9.2" + version="0.0.0" unpack="false"/> <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" download-size="0" install-size="0" - version="2.9.2" + version="0.0.0" unpack="false"/> <plugin @@ -578,15 +615,30 @@ id="com.google.guava" download-size="0" install-size="0" + version="27.1.0.v20190517-1946" + unpack="false"/> + + <plugin + id="com.google.gson" + download-size="0" + install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="com.google.inject" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="com.google.api.client-repackaged-com-google-common-base" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin id="com.jcraft.jsch" @@ -601,14 +653,12 @@ install-size="0" version="0.0.0" unpack="false"/> - - - + <plugin id="org.antlr.runtime" download-size="0" install-size="0" - version="3.2.0" + version="3.2.0.v201101311130" unpack="false"/> <plugin @@ -638,7 +688,27 @@ install-size="0" version="0.0.0" unpack="false"/> - + + <plugin + id="org.apache.aries.blueprint.annotation" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.apache.aries.proxy" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.aries.quiesce" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin id="org.apache.commons.dbcp" download-size="0" @@ -665,7 +735,7 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> <plugin id="org.codehaus.stax2" @@ -673,36 +743,6 @@ install-size="0" version="0.0.0" unpack="false"/> - - - - <plugin - id="org.eclipse.mylyn.commons.net" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - - - - <plugin - id="org.eclipse.mylyn.commons.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - - - - <plugin - id="org.eclipse.mylyn.commons.screenshots" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - <plugin id="org.apache.axis" download-size="0" @@ -717,12 +757,7 @@ version="0.0.0" unpack="false"/> - <plugin - id="javax.mail" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <plugin id="javax.xml.rpc" @@ -739,13 +774,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.mwe.utils" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.nebula.widgets.ganttchart" download-size="0" install-size="0" @@ -828,6 +856,20 @@ install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="javax.mail" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.egit" + download-size="0" + install-size="0" + version="5.0.0.201806131550-r" + unpack="false"/> <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" @@ -842,7 +884,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" download-size="0" @@ -868,9 +910,15 @@ id="org.objectweb.asm" download-size="0" install-size="0" - version="6.1.1" + version="0.0.0" unpack="false"/> - + + <plugin + id="org.eclipse.equinox.ds" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.slf4j.api" @@ -920,7 +968,35 @@ install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="org.eclipse.ui.intro" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.intro.universal" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.intro.quicklinks" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.eclipse.ui.genericeditor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + <plugin id="org.apache.commons.net" download-size="0" @@ -1011,14 +1087,14 @@ id="javax.ws.rs" download-size="0" install-size="0" - version="2.0.1" + version="0.0.0" unpack="false"/> <plugin id="org.eclipse.osgi" download-size="0" install-size="0" - version="0.0.0" + version="3.15.300.v20200520-1959" unpack="false"/> <plugin @@ -1036,8 +1112,8 @@ unpack="false"/> <plugin - id="org.eclipse.osgi.compatibility.state" - download-size="0" + id="org.eclipse.osgi.compatibility.state" + download-size="0" install-size="0" version="0.0.0" unpack="false"/> @@ -1049,29 +1125,35 @@ version="0.0.0" unpack="false"/> + + <plugin id="org.apache.aries.util" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - - - + <plugin - id="javax.activation" + id="org.apache.aries.blueprint.annotation" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin - id="javax.mail.glassfish" + id="org.apache.aries.proxy" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - + + <plugin + id="org.apache.aries.quiesce" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin id="org.apache.commons.pool" download-size="0" @@ -1113,9 +1195,9 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin - id="org.eclipse.ui.views" + id="org.eclipse.ui.browser" download-size="0" install-size="0" version="0.0.0" @@ -1129,11 +1211,46 @@ unpack="false"/> <plugin + id="org.eclipse.e4.ui.workbench" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.workbench.texteditor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.views" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.ui.ide" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="org.eclipse.ui.ide.application" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.e4.core.commands" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.apache.ant" @@ -1154,7 +1271,7 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="true"/> <plugin id="org.h2" @@ -1185,13 +1302,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.mwe.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.apache.commons.cli" download-size="0" install-size="0" @@ -1202,78 +1312,78 @@ id="org.apache.batik.css" download-size="0" install-size="0" - version="1.6.0" + version="0.0.0" unpack="false"/> <plugin id="org.apache.batik.util.gui" download-size="0" install-size="0" - version="1.6.0" + version="0.0.0" unpack="false"/> <plugin id="org.apache.batik.util" download-size="0" install-size="0" - version="1.6.0" + version="0.0.0" unpack="false"/> <plugin id="org.mockito" download-size="0" install-size="0" - version="2.13.0" - unpack="false"/> - + version="0.0.0" + unpack="false"/> + <plugin id="org.eclipse.jsch.core" download-size="0" install-size="0" version="0.0.0" - unpack="false"/> - + unpack="false"/> + <plugin id="org.hamcrest" download-size="0" install-size="0" - version="1.1.0" + version="0.0.0" unpack="false"/> <plugin id="org.hamcrest.core" download-size="0" install-size="0" - version="1.3.0" + version="0.0.0" unpack="false"/> <plugin id="org.hamcrest.generator" download-size="0" install-size="0" - version="1.1.0" + version="0.0.0" unpack="false"/> <plugin id="org.hamcrest.integration" download-size="0" install-size="0" - version="1.1.0" + version="0.0.0" unpack="false"/> <plugin id="org.hamcrest.library" download-size="0" install-size="0" - version="1.1.0" + version="0.0.0" unpack="false"/> <plugin id="org.hamcrest.text" download-size="0" install-size="0" - version="1.1.0" - unpack="false"/> + version="0.0.0" + unpack="false"/> <plugin id="org.apache.xml.serializer" @@ -1315,18 +1425,10 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> - - <plugin - id="org.eclipse.ui.genericeditor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false" /> - <plugin id="org.eclipse.gmf.runtime.common.core" download-size="0" @@ -1571,10 +1673,6 @@ install-size="0" version="0.0.0" unpack="false"/> - - - - <plugin id="org.eclipse.m2m.qvt.oml" download-size="0" install-size="0" @@ -1595,8 +1693,6 @@ version="0.0.0" unpack="false"/> - - <plugin id="org.eclipse.m2m.qvt.oml.emf.util" download-size="0" @@ -1775,7 +1871,7 @@ id="org.eclipse.jetty.util.ajax" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.apache.batik.xml" @@ -1811,41 +1907,49 @@ install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="com.sun.xml.bind" + download-size="0" + install-size="0" + version="2.2.0.v20201118-1845" + unpack="false"/> + + <plugin + id="javassist" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> - <plugin + <plugin id="com.thoughtworks.qdox" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - - <plugin + + <plugin id="org.eclipse.wst.xml.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - - <plugin + + <plugin id="org.eclipse.wst.sse.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin + <plugin id="org.eclipse.wst.common.emf" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.emf.mwe.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> <plugin id="org.eclipse.jem.util" @@ -1865,7 +1969,7 @@ id="javax.xml.soap" download-size="0" install-size="0" - version="1.2.0" + version="0.0.0" unpack="false"/> <plugin @@ -1900,7 +2004,7 @@ id="org.eclipse.jetty.webapp" download-size="0" install-size="0" - version="0.0.0" + version="9.4.39.v20210325" unpack="false"/> <plugin @@ -1914,7 +2018,7 @@ id="org.eclipse.jetty.xml" download-size="0" install-size="0" - version="0.0.0" + version="9.4.39.v20210325" unpack="false"/> <plugin @@ -1944,5 +2048,68 @@ install-size="0" version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.jdt.launching" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jdt.debug" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="io.github.classgraph" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javax.activation" + download-size="0" + install-size="0" + version="1.1.0.v201211130549" + unpack="false"/> + + <plugin + id="org.eclipse.jpt.jaxb.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jpt.jaxb.eclipselink.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jst.ws.jaxb.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ptp.rm.jaxb.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ptp.rm.jaxb.java11" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> </feature> +
diff --git a/features/org.eclipse.osee.dep.feature/pom.xml b/features/org.eclipse.osee.dep.feature/pom.xml index 725e09b..daadf09 100644 --- a/features/org.eclipse.osee.dep.feature/pom.xml +++ b/features/org.eclipse.osee.dep.feature/pom.xml
@@ -29,9 +29,17 @@ <configuration> <excludes> <plugin id="org.apache.xerces" /> + <plugin id="org.apache.aries.proxy" /> <plugin id="org.eclipse.egit" /> <plugin id="org.eclipse.oss.ajax" /> - <plugin id="org.apache.aries.proxy" /> + <plugin id="javax.xml.ws" /> + <plugin id="org.eclipse.jpt.jaxb.core" /> + <plugin id="org.eclipse.jpt.jaxb.eclipselink.core" /> + <plugin id="org.eclipse.jst.ws.jaxb.core" /> + <plugin id="org.eclipse.ptp.rm.jaxb.core" /> + <plugin id=" org.eclipse.ptp.rm.jaxb.java11" /> + + <plugin id="javax.transaction" /> <plugin id="org.apache.cxf.cxf-core" /> <plugin id="org.apache.cxf.cxf-rt-security" /> <plugin id="org.apache.cxf.cxf-rt-transports-http" /> @@ -40,15 +48,25 @@ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" /> <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" /> <plugin id="org.apache.cxf.cxf-rt-rs-client" /> - <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" /> + <plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" /> + <plugin id="org.eclipse.osgi" /> + <plugin id="org.eclipse.osgi.services" /> <plugin id="org.eclipse.m2e.maven.runtime" /> <plugin id="org.apache.cxf.cxf-rt-transports-http" /> <plugin id= "org.apache.cxf.cxf-rt-rs-service-description" /> <plugin id="javax.mail" /> + <plugin id= "org.bouncycastle.asn1" /> <plugin id="org.eclipse.m2e.archetype.common" /> <plugin id="org.eclipse.m2e.mwsaven.indexer" /> + <plugin id="org.apache.sshd.sftp" /> <plugin id="org.eclipse.m2e.workspace.cli" /> + <plugin id="org.bouncycastle.bcpg" /> + <plugin id= "org.bouncycastle.bcpkix" /> + <plugin id= "org.bouncycastle.bcprov" /> + <plugin id="org.apache.sshd.client.subsystem.sftp" /> <feature id="org.eclipse.cdt.sdk" /> + <feature id="org.eclipse.jgit.gpg.bc" /> + <feature id="org.eclipse.jgit.ssh.apache" /> <feature id="org.eclipse.mylyn.commons" /> <feature id="org.eclipse.mylyn.commons.identity" /> <feature id="org.eclipse.mylyn.commons.notifications" /> @@ -61,11 +79,29 @@ <feature id="org.eclipse.launchbar" /> <feature id="org.eclipse.tm.terminal.control.feature" /> <plugin id="javax.xml" /> + <plugin id="com.fasterxml.jackson.core.jackson-core" /> + <plugin id="com.fasterxml.jackson.core.jackson-annotations" /> + <plugin id="com.fasterxml.jackson.core.jackson-databind" /> + <plugin id="com.google.guava" /> + <plugin id="org.eclipse.xwt" /> + <plugin id="org.eclipse.mylyn.commons.net" /> + <plugin id="org.eclipse.mylyn.commons.core" /> + <plugin id="org.eclipse.mylyn.commons.screenshots" /> + <plugin id="ch.qos.logback.core" /> + <plugin id="ch.qos.logback.classic" /> + <plugin id="org.eclipse.equinox.ds" /> + <plugin id="org.eclipse.equinox.util" /> + <plugin id="javax.activation" /> + <plugin id="com.sun.jna" /> + <plugin id="com.sun.jna.platform" /> + <plugin id="javaewah" /> + <plugin id="org.apache.commons.compress" /> <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" /> <plugin id="javax.xml.rpc" /> <plugin id="org.apache.commons.discovery" /> <feature id="org.eclipse.mylyn_feature" /> <feature id="edu.umd.cs.findbugs.plugin.eclipse" /> + <feature id="org.eclipse.jgit.ssh.jsch" /> <feature id="org.eclipse.mylyn.context_feature" /> <feature id="org.eclipse.mylyn.team_feature" /> <plugin id="org.apache.xml.resolver" /> @@ -185,6 +221,7 @@ <feature id="org.eclipse.ecf.filetransfer.ssl.feature" /> <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" /> <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature" /> + <feature id="org.eclipse.equinox.core.feature" /> <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature.source" /> <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" /> <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" />
diff --git a/features/org.eclipse.osee.doors.feature/feature.xml b/features/org.eclipse.osee.doors.feature/feature.xml index 66f11bd..e67a2f2 100644 --- a/features/org.eclipse.osee.doors.feature/feature.xml +++ b/features/org.eclipse.osee.doors.feature/feature.xml
@@ -17,9 +17,14 @@ %license </license> - <requires> - <import plugin="org.eclipse.ui"/> - </requires> + + + <plugin + id="org.eclipse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.eclipse.osee.doors.connector.core"
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml index f4226d8..e214d88 100644 --- a/features/org.eclipse.osee.external.feature/feature.xml +++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -28,7 +28,6 @@ <import plugin="org.eclipse.osgi.util"/> <import plugin="org.eclipse.osgi.compatibility.state"/> <import plugin="org.eclipse.core.runtime"/> - <import plugin="javax.xml" version="1.3.4" match="compatible"/> <import plugin="javax.servlet"/> <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/> <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/> @@ -36,7 +35,6 @@ <import feature="org.eclipse.nebula.widgets.ganttchart.feature" version="0.0.0" match="greaterOrEqual"/> <import feature="org.eclipse.graphiti.feature" version="0.0.0" match="greaterOrEqual"/> <import feature="org.eclipse.graphiti.feature.source" version="0.0.0" match="greaterOrEqual"/> - <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/> <import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/> <import plugin="com.jcraft.jsch" version="0.1.44" match="greaterOrEqual"/> <import plugin="org.apache.commons.logging" version="1.1.1" match="equivalent"/> @@ -58,7 +56,12 @@ version="0.0.0" unpack="false"/> - + <plugin + id="javax.transaction" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" @@ -129,7 +132,7 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="com.fasterxml.jackson.core.jackson-core" download-size="0" @@ -152,7 +155,7 @@ version="0.0.0" fragment="true" unpack="false"/> - + <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" download-size="0" @@ -219,13 +222,6 @@ unpack="false"/> <plugin - id="org.eclipse.equinox.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="javax.mail.glassfish" download-size="0" install-size="0" @@ -295,6 +291,13 @@ unpack="false"/> <plugin + id="javax.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.apache.xml.resolver" download-size="0" install-size="0" @@ -385,9 +388,23 @@ id="org.objectweb.asm" download-size="0" install-size="0" - version="6.1.1" + version="8.0.1.v20200420-1007" unpack="false"/> + <plugin + id="org.antlr.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="io.github.classgraph" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin id="org.apache.commons.dbcp" download-size="0"
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml index fff4717..72b7caf 100644 --- a/features/org.eclipse.osee.external.feature/pom.xml +++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -37,8 +37,21 @@ <plugin id="org.apache.cxf.cxf-rt-rs-security-jose-jaxrs" /> <plugin id="org.apache.cxf.cxf-core" /> <plugin id="org.apache.xerces" /> + <plugin id="javax.xml.bind" /> + <plugin id="org.antlr.runtime" /> <plugin id="javax.xml" /> + <plugin id="javax.transaction" /> + <plugin id="javax.activation" /> + <plugin id="org.eclipse.osgi.services" /> <plugin id="org.apache.ws.xmlschema.core" /> + <plugin id="com.fasterxml.jackson.core.jackson-core" /> + <plugin id="com.fasterxml.jackson.core.jackson-annotations" /> + <plugin id="com.fasterxml.jackson.core.jackson-databind" /> + <plugin id="ch.qos.logback.classic" /> + <plugin id="ch.qos.logback.core" /> + <plugin id="org.eclipse.equinox.ds" /> + <plugin id="com.google.guava" /> + <plugin id="javax.mail" /> <plugin id="javax.annotation" /> <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" /> <plugin id="org.apache.cxf.cxf-rt-rs-json-basic" />
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml index cc55aed..0fee7ba 100644 --- a/features/org.eclipse.osee.framework.feature/feature.xml +++ b/features/org.eclipse.osee.framework.feature/feature.xml
@@ -16,20 +16,19 @@ <license url="%licenseURL"> %license </license> - - + <includes id="org.eclipse.egit" - version="5.0.0"/> + version="5.0.0.201806131550-r"/> <includes id="org.eclipse.jgit.lfs" - version="5.0.0"/> + version="5.0.0.201806131550-r"/> <includes id="org.eclipse.jgit.http.apache" - version="5.0.0"/> - + version="5.0.0.201806131550-r"/> + <requires> <import feature="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/> @@ -37,21 +36,112 @@ <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/> - <import feature="org.eclipse.emf.compare" version="1.0.0" match="greaterOrEqual"/> <import feature="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.osee.core.runtime.feature" version="0.9.5" match="greaterOrEqual"/> <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/> <import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/> - <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.2" match="greaterOrEqual"/> - <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2" match="greaterOrEqual" /> - <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.2" match="greaterOrEqual" /> - <import plugin="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.2" match="greaterOrEqual" /> - <import plugin="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.2" match="greaterOrEqual" /> <import plugin="org.jsoup"/> <import plugin="org.hsqldb"/> <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual" /> </requires> + + <plugin + id="javax.transaction" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.apache.commons.dbcp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="javax.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javassist" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.sun.xml.bind" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.swt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.intro" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.intro.universal" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.intro.quicklinks" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + + <plugin + id="io.github.classgraph" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javaewah" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin + id="com.google.guava" + download-size="0" + install-size="0" + version="27.1.0.v20190517-1946" + unpack="false"/> + + <plugin + id="javax.activation" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.google.gson" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.apache.cxf.cxf-rt-rs-security-jose" @@ -93,8 +183,19 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> - + unpack="false"/> + <plugin + id="org.eclipse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.eclipse.ui.browser" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" download-size="0" @@ -124,12 +225,39 @@ unpack="false"/> <plugin + id="javax.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + + <plugin id="javax.xml.stream" download-size="0" install-size="0" version="0.0.0" unpack="false" /> - + <plugin + id="javax.xml.rpc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javax.xml.soap" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="javax.xml.ws" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false" /> + <plugin id="org.eclipse.sdk" download-size="0" @@ -167,13 +295,13 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.egit" + <plugin + id="jakarta.xml.bind" download-size="0" install-size="0" - version="5.0.0" - unpack="false"/> - + version="0.0.0" + unpack="false" /> + <plugin id="javax.annotation" download-size="0" @@ -192,7 +320,7 @@ id="org.mockito" download-size="0" install-size="0" - version="2.13.0" + version="0.0.0" unpack="false"/> <plugin @@ -292,54 +420,61 @@ install-size="0" version="0.0.0" unpack="false"/> + + <plugin + id="org.antlr.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.eclipse.jetty.http" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.io" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.security" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.server" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.servlet" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.util" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> <plugin id="org.eclipse.jetty.util.ajax" download-size="0" install-size="0" - version="9.4.39" + version="9.4.39.v20210325" unpack="false"/> </feature>
diff --git a/features/org.eclipse.osee.framework.feature/pom.xml b/features/org.eclipse.osee.framework.feature/pom.xml index 2fec98e..32ecc53 100644 --- a/features/org.eclipse.osee.framework.feature/pom.xml +++ b/features/org.eclipse.osee.framework.feature/pom.xml
@@ -30,8 +30,26 @@ <excludes> <plugin id="org.eclipse.osee.framework.templates" /> <plugin id="org.postgresql.driver" /> + <plugin id="com.google.gson" /> + <plugin id="javax.activation" /> + <plugin id="org.antlr.runtime" /> + <plugin id="javaewah" /> <plugin id="org.hamcrest" /> + <plugin id="javax.xml.ws" /> + <plugin id="javax.xml.rpc" /> + <plugin id="javax.xml.soap" /> + <plugin id="javax.xml" /> + <plugin id="javax.transaction" /> + <plugin id="com.fasterxml.jackson.core.jackson-core" /> + <plugin id="com.fasterxml.jackson.core.jackson-annotations" /> + <plugin id="com.fasterxml.jackson.core.jackson-databind" /> + <plugin id="ch.qos.logback.classic" /> + <plugin id="ch.qos.logback.core" /> + <plugin id="org.eclipse.equinox.ds" /> + <plugin id="com.google.guava" /> + <plugin id="javax.mail" /> <plugin id="org.apache.cxf.cxf-core" /> + <plugin id="org.eclipse.swt" /> <plugin id="org.apache.cxf.cxf-rt-security" /> <plugin id="org.apache.cxf.cxf-rt-transports-http" /> <plugin id="org.apache.cxf.cxf-rt-rs-security-oauth2" />
diff --git a/features/org.eclipse.osee.framework.ui.feature/feature.xml b/features/org.eclipse.osee.framework.ui.feature/feature.xml index 2dac952..e3bf79c 100644 --- a/features/org.eclipse.osee.framework.ui.feature/feature.xml +++ b/features/org.eclipse.osee.framework.ui.feature/feature.xml
@@ -20,20 +20,16 @@ <requires> - <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.osee.framework.ui.ws"/> <import plugin="org.eclipse.osee.framework.skynet.core"/> <import plugin="org.eclipse.osee.framework.core.client"/> <import plugin="org.eclipse.osee.framework.core"/> - <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/> <import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/> <import plugin="org.eclipse.osee.framework.jdk.core"/> <import plugin="org.eclipse.osee.framework.logging"/> <import plugin="org.eclipse.osee.framework.plugin.core"/> <import plugin="org.eclipse.osee.framework.ui.plugin"/> - <import plugin="org.eclipse.osee.framework.ui.swt"/> - <import plugin="org.eclipse.ui.intro"/> <import plugin="javax.mail.glassfish"/> <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.core.expressions"/> @@ -44,10 +40,6 @@ <import plugin="org.eclipse.jface.text"/> <import plugin="org.eclipse.nebula.widgets.xviewer"/> <import plugin="org.eclipse.search"/> - <import plugin="org.eclipse.ui.forms"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.eclipse.zest.core"/> <import plugin="org.eclipse.core.filesystem"/> <import plugin="com.lowagie.text"/> @@ -58,31 +50,90 @@ <import plugin="org.eclipse.gef"/> <import plugin="org.eclipse.osee.ote.define"/> <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.emf.common"/> <import plugin="org.eclipse.core.commands"/> <import plugin="org.eclipse.core.jobs"/> - <import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.osgi"/> <import plugin="org.eclipse.jdt.core"/> <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual" /> <import plugin="org.apache.commons.io" version="2.2.0" match="compatible"/> </requires> - + + <plugin + id="org.apache.commons.dbcp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.ui.swt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.swt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.ide" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.forms" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.workbench.texteditor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.views" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.browser" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="com.fasterxml.jackson.core.jackson-core" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.antlr.runtime" download-size="0" install-size="0" - version="3.2.0" - unpack="false"/> - + version="0.0.0" + unpack="false"/> + <plugin id="org.eclipse.sdk" download-size="0"
diff --git a/features/org.eclipse.osee.framework.ui.feature/pom.xml b/features/org.eclipse.osee.framework.ui.feature/pom.xml index 4e80a9b..674f582 100644 --- a/features/org.eclipse.osee.framework.ui.feature/pom.xml +++ b/features/org.eclipse.osee.framework.ui.feature/pom.xml
@@ -32,6 +32,8 @@ <plugin id="org.eclipse.osee.framework.dev.help.ui" /> <plugin id="org.eclipse.sdk" /> <plugin id="org.antlr.runtime" /> + <plugin id="org.eclipse.swt" /> + <plugin id="com.fasterxml.jackson.core.jackson-core" /> </excludes> </configuration> </execution>
diff --git a/plugins/jms.activemq.launch/META-INF/MANIFEST.MF b/plugins/jms.activemq.launch/META-INF/MANIFEST.MF index 68785d6..caea056 100644 --- a/plugins/jms.activemq.launch/META-INF/MANIFEST.MF +++ b/plugins/jms.activemq.launch/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: jms.activemq.launch;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.jms, 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 a720178..37b30f4 100644 --- a/plugins/jms.libraries/META-INF/MANIFEST.MF +++ b/plugins/jms.libraries/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Eclipse-BuddyPolicy: global -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: libs/geronimo-j2ee-management_1.0_spec-1.0.jar, libs/geronimo-jms_1.1_spec-1.1.1.jar, libs/activemq-all-5.14.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 171ad64..d394c68 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.account.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport
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 eb2703e..8e3ae5c 100644 --- a/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.admin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Import-Package: org.eclipse.osee.account.rest.model, org.eclipse.osee.authentication.admin,
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 0db7607..114715a 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.account.rest.client;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs, javax.ws.rs.client,
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 0949309..5e1aca1 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
@@ -5,10 +5,13 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.account.rest.model Import-Package: com.fasterxml.jackson.databind, com.fasterxml.jackson.core, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util
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 8e7d7e4..de3bc45 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.account.rest.test;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.account.rest Require-Bundle: org.hamcrest.core,
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 c65d202..9004a7d 100644 --- a/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.account.rest/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 5414979..12851f7 100644 --- a/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.activity.api/META-INF/MANIFEST.MF
@@ -4,9 +4,12 @@ Bundle-SymbolicName: org.eclipse.osee.activity.api;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.activity.api -Import-Package: javax.ws.rs, +Import-Package: javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, + javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.type,
diff --git a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF index 6f741a8..e6db646 100644 --- a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.activity;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs,
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 bd332b3..59b3f07 100644 --- a/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.app.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.app -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 078bd5a..146eea2 100644 --- a/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.app/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.app;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Osee-JaxRs-Resource: OSEE-INF/oseeApp/*;path=/osee_app Import-Package: javax.ws.rs,
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 f78ba23..23c109b 100644 --- a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.ats.api, org.eclipse.osee.ats.api.access,
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 b7053e8..83bd6ae 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.ats.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.hamcrest.core, org.mockito;visibility:=reexport,
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 88b8532..14e4579 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-SymbolicName: org.eclipse.osee.ats.core;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.core, com.fasterxml.jackson.databind,
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/tx/AtsConfigTxTeamDef.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/tx/AtsConfigTxTeamDef.java index 0e8a922..17c85b1 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/tx/AtsConfigTxTeamDef.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/tx/AtsConfigTxTeamDef.java
@@ -36,8 +36,8 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.core.data.AccessContextToken; -import org.eclipse.osee.framework.core.data.ArtifactTypeToken; import org.eclipse.osee.framework.core.data.AccessContextToken; +import org.eclipse.osee.framework.core.data.ArtifactTypeToken; import org.eclipse.osee.framework.core.data.BranchToken; import org.eclipse.osee.framework.core.data.UserToken; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
diff --git a/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF index 4b1dc4d..798261a 100644 --- a/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF
@@ -43,7 +43,6 @@ org.eclipse.osee.ats.ide.workflow.teamwf, org.eclipse.osee.ats.ide.world, org.eclipse.osee.ats.ide.world.search, - org.eclipse.osee.client.demo, org.eclipse.osee.define.ide.traceability, org.eclipse.osee.define.ide.traceability.data, org.eclipse.osee.framework.core, @@ -90,6 +89,6 @@ org.eclipse.osee.ats.ide.demo.config, org.eclipse.osee.ats.ide.demo.populate, org.eclipse.osee.ats.ide.demo.workflow.cr -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Activator: org.eclipse.osee.ats.ide.demo.internal.Activator Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.ats.ide.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide.help.ui.test/META-INF/MANIFEST.MF index 593bcff..609d3c9 100644 --- a/plugins/org.eclipse.osee.ats.ide.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.ide.help.ui.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ats.ide.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.core.util,
diff --git a/plugins/org.eclipse.osee.ats.ide.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide.help.ui/META-INF/MANIFEST.MF index d35d296..b385495 100644 --- a/plugins/org.eclipse.osee.ats.ide.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.ide.help.ui/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.osee.framework.core.data Export-Package: org.eclipse.osee.ats.help.ui
diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide.integration.tests/META-INF/MANIFEST.MF index 532753a..9d56c0b 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.core.runtime, org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/access/AtsBranchAccessManagerTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/access/AtsBranchAccessManagerTest.java index 26e6499..ca037f1 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/access/AtsBranchAccessManagerTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/access/AtsBranchAccessManagerTest.java
@@ -57,7 +57,7 @@ Assert.assertTrue(mgr.isApplicable(branch)); } - @Test + @Test public void testGetContextIds() throws Exception { IAtsAccessService accessService = AtsApiService.get().getAtsAccessService(); TeamWorkFlowArtifact teamArt = DemoUtil.getButtonWDoesntWorkOnSituationPageWf();
diff --git a/plugins/org.eclipse.osee.ats.ide.p2/pom.xml b/plugins/org.eclipse.osee.ats.ide.p2/pom.xml index 8d339d6..09b3fc9 100644 --- a/plugins/org.eclipse.osee.ats.ide.p2/pom.xml +++ b/plugins/org.eclipse.osee.ats.ide.p2/pom.xml
@@ -14,7 +14,7 @@ <packaging>eclipse-repository</packaging> <name>OSEE ATS - p2 Site </name> <version>1.0.0-SNAPSHOT</version> - + <!-- <build> <plugins> <plugin>
diff --git a/plugins/org.eclipse.osee.ats.ide.parent/pom.xml b/plugins/org.eclipse.osee.ats.ide.parent/pom.xml index c58babc..9e27c96 100644 --- a/plugins/org.eclipse.osee.ats.ide.parent/pom.xml +++ b/plugins/org.eclipse.osee.ats.ide.parent/pom.xml
@@ -22,7 +22,7 @@ <id>coverage-minimal</id> <activation> <property> - <name>no-int-tests</name> + <name>skip-int-tests</name> </property> </activation> <modules> @@ -37,7 +37,6 @@ <module>../../features/org.eclipse.osee.ats.ide.feature</module> <module>../../features/org.eclipse.osee.ats.ide.demo.feature</module> - <module>../../plugins/org.eclipse.osee.ats.ide.integration.tests</module> <module>../../plugins/org.eclipse.osee.ats.ide.p2</module> </modules> </profile> @@ -46,7 +45,7 @@ <id>coverage-release</id> <activation> <property> - <name>!no-int-tests</name> + <name>!skip-int-tests</name> </property> </activation> <modules> @@ -60,7 +59,7 @@ <module>../../features/org.eclipse.osee.ats.ide.feature</module> <module>../../features/org.eclipse.osee.ats.ide.demo.feature</module> - <module>../../plugins/org.eclipse.osee.ats.ide.integration.tests</module> + <module>../../plugins/org.eclipse.osee.ats.ide.integration.tests</module> <module>../../plugins/org.eclipse.osee.ats.ide.p2</module> </modules>
diff --git a/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF index be20d78..e38ff71 100644 --- a/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF
@@ -264,4 +264,4 @@ org.eclipse.zest.core.widgets, org.osgi.service.component.annotations, org.osgi.service.event -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF index ebf7512..48564a4 100644 --- a/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.ats.rest -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.emf.common.util, org.eclipse.jdt.annotation, org.eclipse.osee.ats.api.workdef,
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 e1b9367..e8b2e6b 100644 --- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.rest;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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.authentication.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.admin.test/META-INF/MANIFEST.MF index ca60e1a..44e7456 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.authentication.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport
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 8616483..9c90338 100644 --- a/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 5a0ea4b..7bf8f28 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.authentication.ldap -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport Import-Package: org.junit,
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 a48b498..37ec5fd 100644 --- a/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authentication.ldap/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 3b22852..e641029 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.authorization.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport
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 5f33c8e..ee69adf 100644 --- a/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.authorization.admin Import-Package: org.eclipse.osee.framework.jdk.core.util,
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 a79275c..b767a69 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
@@ -4,8 +4,10 @@ Bundle-SymbolicName: org.eclipse.osee.cache.admin.test;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.cache.admin -Require-Bundle: org.junit, - org.mockito;visibility:=reexport +Import-Package: org.mockito, + org.mockito.invocation, + org.mockito.stubbing +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 2e44205..82230e9 100644 --- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.common.base, com.google.common.cache, com.google.common.collect,
diff --git a/plugins/org.eclipse.osee.client.all.p2/pom.xml b/plugins/org.eclipse.osee.client.all.p2/pom.xml index 623f7ee..d7a7d81 100644 --- a/plugins/org.eclipse.osee.client.all.p2/pom.xml +++ b/plugins/org.eclipse.osee.client.all.p2/pom.xml
@@ -15,7 +15,7 @@ <name>OSEE All Client - p2 Site </name> <version>1.0.0-SNAPSHOT</version> - <build> + <build> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -26,6 +26,6 @@ </configuration> </plugin> </plugins> - </build> + </build> </project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.client.all.product/org.eclipse.osee.ide.product b/plugins/org.eclipse.osee.client.all.product/org.eclipse.osee.ide.product index fa9076c..e5e607d 100644 --- a/plugins/org.eclipse.osee.client.all.product/org.eclipse.osee.ide.product +++ b/plugins/org.eclipse.osee.client.all.product/org.eclipse.osee.ide.product
@@ -42,6 +42,7 @@ <feature id="org.eclipse.osee.client.all.feature"/> <feature id="org.eclipse.osee.client.all.feature.source"/> <feature id="org.eclipse.sdk"/> + <feature id="org.eclipse.egit"/> </features> <configurations>
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 acfe5e3..719f2c4 100644 --- a/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.demo/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.client.demo;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: javax.ws.rs.core,
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 feb1dfe..5c41a94 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
@@ -5,9 +5,10 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml -Import-Package: javax.ws.rs.client, +Import-Package: javax.activation, + javax.ws.rs.client, javax.ws.rs.core, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs,
diff --git a/plugins/org.eclipse.osee.client.p2/pom.xml b/plugins/org.eclipse.osee.client.p2/pom.xml index e29c667..a0dff97 100644 --- a/plugins/org.eclipse.osee.client.p2/pom.xml +++ b/plugins/org.eclipse.osee.client.p2/pom.xml
@@ -15,7 +15,7 @@ <name>OSEE Client - p2 Site </name> <version>1.0.0-SNAPSHOT</version> - <!-- <build> + <!-- <build> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId>
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml index 58c2b52..3a8aa3e 100644 --- a/plugins/org.eclipse.osee.client.parent/pom.xml +++ b/plugins/org.eclipse.osee.client.parent/pom.xml
@@ -23,7 +23,7 @@ <id>coverage-minimal</id> <activation> <property> - <name>no-int-tests</name> + <name>skip-int-tests</name> </property> </activation> <modules> @@ -88,7 +88,7 @@ <id>coverage-release</id> <activation> <property> - <name>!no-int-tests</name> + <name>!skip-int-tests</name> </property> </activation> <modules> @@ -140,9 +140,8 @@ <module>../../plugins/org.eclipse.osee.client.test.framework</module> <module>../../plugins/org.eclipse.osee.client.test.framework.p2</module> - <module>../../features/org.eclipse.osee.client.feature</module> - <module>../../plugins/org.eclipse.osee.client.integration.tests</module> + <module>../../plugins/org.eclipse.osee.client.integration.tests</module> <module>../../plugins/org.eclipse.osee.client.p2</module>
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 628757d..aaab1d1 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.client.test.framework;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.junit, org.eclipse.core.runtime
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 01d1501..98bb56d 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.config.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport
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 1555399..8e18746 100644 --- a/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.config.admin/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.config.admin;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: com.fasterxml.jackson.core,
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 d3d36bf..f52a408 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.console.admin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 b8ee056..2547f8d 100644 --- a/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.console.admin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.osee.framework.core.executor, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util,
diff --git a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF index faa0eae..1316129 100644 --- a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ org.eclipse.osee.define.ide.traceability.operations, org.eclipse.osee.define.ide.traceability.report, org.eclipse.osee.define.ide.utility -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.eclipse.osee.framework.ui.skynet, + org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.core.filesystem,
diff --git a/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF index f437e20..bdc8c35 100644 --- a/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml +Require-Bundle: org.antlr.runtime Import-Package: com.fasterxml.jackson.core, com.fasterxml.jackson.databind, com.google.common.base, @@ -14,21 +15,20 @@ com.jcraft.jsch, javax.ws.rs, javax.ws.rs.core, - org.antlr.runtime, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.define.api.importing, org.eclipse.jdt.core, org.eclipse.jdt.core.compiler, org.eclipse.jdt.core.dom, + org.eclipse.jgit.transport, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, - org.eclipse.jgit.diff, org.eclipse.jgit.errors, + org.eclipse.jgit.diff, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.storage.file, - org.eclipse.jgit.transport, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util,
diff --git a/plugins/org.eclipse.osee.dep.parent/pom.xml b/plugins/org.eclipse.osee.dep.parent/pom.xml index c5fa939..15e9344 100644 --- a/plugins/org.eclipse.osee.dep.parent/pom.xml +++ b/plugins/org.eclipse.osee.dep.parent/pom.xml
@@ -14,16 +14,12 @@ <module>../../plugins/org.eclipse.osee.dep.p2</module> </modules> - - - - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <tycho-version>0.22.0</tycho-version> - <tycho-extras-version>0.22.0</tycho-extras-version> + <tycho-version>1.7.0</tycho-version> + <tycho-extras-version>1.7.0</tycho-extras-version> <build-alias>-DEV</build-alias> @@ -38,16 +34,16 @@ <jaxdoclet-version>0.9.0</jaxdoclet-version> <maven-clean-version>2.5</maven-clean-version> - <platform-version-name>photon</platform-version-name> <!-- <orbit-version>R20150124073747</orbit-version> --> <orbit-version>R20181128170323</orbit-version> <subversive-version>4.0</subversive-version> <polarion-version>3.0</polarion-version> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site> - <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> + <eclipse-site>http://download.eclipse.org/releases/2020-06/202006171000/</eclipse-site> + <!-- <eclipse-site>http://download.eclipse.org/releases/2020-06/202006171000</eclipse-site> --> <eclipse-ip-site>https://github.com/osee-dev/osee.external.releases/raw/master/org.eclipse.ip</eclipse-ip-site> - <papyrus-site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/${platform-version-name}</papyrus-site> + <papyrus-site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06/202006171000/</papyrus-site> <nebula-site>http://download.eclipse.org/nebula/releases/2.4.2</nebula-site> <subversive-site>http://download.eclipse.org/technology/subversive/${subversive-version}/update-site</subversive-site> <polarion-site>http://community.polarion.com/projects/subversive/download/eclipse/6.0/neon-site</polarion-site> @@ -80,19 +76,25 @@ <layout>p2</layout> <url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.39.v20210325/</url> </repository> - - <repository> - <id>mylyn2</id> - <layout>p2</layout> - <url>http://download.eclipse.org/mylyn/drops/3.5.1/v20110422-0200/</url> - </repository> - - <repository> - <id>orbit</id> - <layout>p2</layout> - <url>${orbit-site}</url> - </repository> + <repository> + <id>mylyn</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917/</url> + </repository> + + <repository> + <id>egit</id> + <layout>p2</layout> + <url>http://archive.eclipse.org/egit/updates-5.0/</url> + </repository> + + <repository> + <id>orbit_newer</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository</url> + </repository> + <repository> <id>findbugs</id> <layout>p2</layout> @@ -104,25 +106,25 @@ <layout>p2</layout> <url>${eclipse-site}</url> </repository> - - <repository> + <!-- + <repository> <id>polarion</id> <layout>p2</layout> <url>${polarion-site}</url> - </repository> - + </repository> + --> <repository> <id>eclipse-ip</id> <layout>p2</layout> <url>${eclipse-ip-site}</url> </repository> - + <!-- <repository> <id>papyrus</id> <layout>p2</layout> <url>${papyrus-site}</url> </repository> - + --> <repository> <id>nebula</id> <layout>p2</layout> @@ -141,6 +143,12 @@ <url>${emma-site}</url> </repository> + <repository> + <id>ecf</id> + <layout>p2</layout> + <url>http://download.eclipse.org/rt/ecf/3.14.18/site.p2/3.14.9.v20200713-0653</url> + </repository> + </repositories> @@ -182,16 +190,9 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> + + + <environment> <os>linux</os> <ws>gtk</ws> @@ -220,16 +221,8 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> + + <environment> <os>linux</os> <ws>gtk</ws>
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 5f5b180..3277282 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.disposition.rest.model;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Export-Package: org.eclipse.osee.disposition.model Import-Package: com.fasterxml.jackson.core, @@ -12,6 +12,9 @@ com.fasterxml.jackson.databind, com.fasterxml.jackson.databind.annotation, com.fasterxml.jackson.databind.deser.std, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util
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 4caa9e1..fbd379c 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.disposition.rest.test;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.disposition.rest Require-Bundle: org.hamcrest.core,
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 d2b42ea..72bdee1 100644 --- a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.disposition.rest;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package:
diff --git a/plugins/org.eclipse.osee.doors.connector.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.doors.connector.core/META-INF/MANIFEST.MF index 786db11..0c20da4 100644 --- a/plugins/org.eclipse.osee.doors.connector.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.doors.connector.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Bosch GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.doors.connector.core, org.eclipse.osee.doors.connector.core.oauth, org.scribe.builder,
diff --git a/plugins/org.eclipse.osee.doors.connector.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.doors.connector.ui/META-INF/MANIFEST.MF index 92a7784..4c63ef0 100644 --- a/plugins/org.eclipse.osee.doors.connector.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.doors.connector.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Bosch GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.core, com.fasterxml.jackson.databind, javax.ws.rs.core,
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 5eb3c62..138a88c 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
@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.core.runtime, org.apache.commons.codec -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.framework.authentication.ldap.core, org.eclipse.osee.framework.authentication.ldap.core.internal, 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 1dbdd6e..fa7bfed 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-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 2f332c1..0427f10 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.osee.framework.core.client.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.core, org.eclipse.core.runtime, org.eclipse.jdt.annotation,
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 33556f4..ad2ad43 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.model -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 321619b..275d363 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.databind.annotation, org.eclipse.core.runtime,
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 edbf5e2..5a735fb 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.server -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.hamcrest.core, org.mockito;visibility:=reexport
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 89c5dd6..07833e7 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet, javax.servlet.http, javax.ws.rs,
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 d7b40a2..be037d6 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.hamcrest.core, org.mockito;visibility:=reexport
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/executor/internal/ExecutionCallbackTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/executor/internal/ExecutionCallbackTest.java index 6cd79b5..b5071ad 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/executor/internal/ExecutionCallbackTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/executor/internal/ExecutionCallbackTest.java
@@ -72,8 +72,8 @@ String expected = "Was Called"; when(callable.call()).thenReturn(expected); - - Future<String> future = admin.schedule(ExecutorAdminImpl.DEFAULT_EXECUTOR, callable, callback); + Future<String> future; + future = admin.schedule(ExecutorAdminImpl.DEFAULT_EXECUTOR, callable, callback); String actual = future.get(); assertEquals(expected, actual); @@ -90,7 +90,6 @@ when(callable.call()).thenThrow(expectedException); Future<String> future = admin.schedule(ExecutorAdminImpl.DEFAULT_EXECUTOR, callable, callback); - thrown.expect(ExecutionException.class); future.get(); @@ -103,7 +102,6 @@ public void testCallbackOnCancel() throws Exception { TestCancellableCallable callable = new TestCancellableCallable("results"); Future<String> future = admin.schedule(ExecutorAdminImpl.DEFAULT_EXECUTOR, callable, callback); - while (!callable.hasBeenCalled()) { Thread.sleep(20); }
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 710bdb9..c82f668 100644 --- a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
@@ -5,8 +5,10 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.annotation, + org.antlr.runtime, + org.antlr.runtime.tree, com.fasterxml.jackson.core, com.fasterxml.jackson.core.type, com.fasterxml.jackson.core.util, @@ -22,8 +24,6 @@ com.google.common.util.concurrent, javax.ws.rs.client, javax.ws.rs.core, - org.antlr.runtime, - org.antlr.runtime.tree, org.apache.commons.httpclient, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, @@ -46,7 +46,10 @@ org.eclipse.osgi.framework.console, org.osgi.framework, org.osgi.service.event, - org.osgi.util.tracker + org.osgi.util.tracker, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation Export-Package: org.eclipse.osee.framework.core, org.eclipse.osee.framework.core.access, org.eclipse.osee.framework.core.access.context,
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/executor/internal/ExecutorAdminImpl.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/executor/internal/ExecutorAdminImpl.java index a83b809..c15744c 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/executor/internal/ExecutorAdminImpl.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/executor/internal/ExecutorAdminImpl.java
@@ -91,8 +91,10 @@ ListenableFuture<T> listenableFuture = getExecutor(id).submit(callable); if (callback != null) { FutureCallback<T> futureCallback = asFutureCallback(callback); - Futures.addCallback(listenableFuture, futureCallback); + ExecutorService ex = Executors.newSingleThreadExecutor(); + Futures.addCallback(listenableFuture, futureCallback, ex); } + return listenableFuture; }
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 88e7d4d..8e091ff 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-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.osee.framework.database.init.internal.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.commons.lang, org.apache.commons.lang.builder, org.apache.xml.serialize,
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 189d793..5779420 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.dev.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 8bec98a..a67a433 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
@@ -5,4 +5,4 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 035be44..8dbb8ee 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.help.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 7f7abd5..a7b83a9 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
@@ -5,6 +5,6 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 5b4ba27..a708b13 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.jdk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.hamcrest.core, org.mockito;visibility:=reexport,
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 2355b7f..746d560 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
@@ -26,7 +26,7 @@ org.eclipse.osee.framework.jdk.core.util.time, org.eclipse.osee.framework.jdk.core.util.windows, org.eclipse.osee.framework.jdk.core.util.xml -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.core, com.fasterxml.jackson.core.type, @@ -39,4 +39,7 @@ com.google.common.collect, javax.ws.rs.core, org.apache.commons.codec.binary, + javax.activation, + javax.xml.bind.annotation, org.eclipse.jdt.annotation +
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 c50aa71..f6b5dae 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
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclispe.org Fragment-Host: org.eclipse.osee.framework.lifecycle -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 691b7ec..0f34e39 100644 --- a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 348e1e7..e8c1d6e 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
@@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 4cdc4b6..e586b5d 100644 --- a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Import-Package: org.eclipse.osee.framework.jdk.core.result, org.eclipse.osee.framework.jdk.core.util Export-Package: org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.osee.framework.jdk.core
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 4b4ec15..29c9793 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
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.messaging.event.res -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 29f5574..c89024d 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,8 +7,11 @@ Eclipse-ExtensibleAPI: true Bundle-Description: Skynet Event Service - Skynet Cache Network Manager Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.core.runtime, +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, + org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.enums.token,
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 260b16e..e4a5e50 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
@@ -8,9 +8,10 @@ Require-Bundle: org.junit, org.hamcrest.core, org.mockito;visibility:=reexport -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: javax.xml.bind, +Import-Package: javax.xml, + javax.xml.bind, javax.xml.bind.annotation, javax.xml.namespace, org.eclipse.osee.framework.jdk.core.annotation,
diff --git a/plugins/org.eclipse.osee.framework.messaging.test/pom.xml b/plugins/org.eclipse.osee.framework.messaging.test/pom.xml index b34f31d..a7bb684 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/pom.xml +++ b/plugins/org.eclipse.osee.framework.messaging.test/pom.xml
@@ -14,6 +14,36 @@ <packaging>eclipse-test-plugin</packaging> <name>OSEE Messaging Test (Incubation)</name> +<dependencies> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> +</dependency> + +<!-- Runtime, com.sun.xml.bind module --> +<dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> +</dependency> + </dependencies> + <build> <plugins> <plugin>
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 c85d600..7ad42a1 100644 --- a/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.osee.framework.messaging.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 8c1f17c..74b0827 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
@@ -22,4 +22,4 @@ org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.io, org.eclipse.osee.framework.logging -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 f2f3eee..42dee09 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
@@ -15,4 +15,4 @@ org.junit.runners, org.osgi.framework, org.osgi.util.tracker -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 130d136..165e59a 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
@@ -17,4 +17,4 @@ 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.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/org.eclipse.osee.framework.server.ide.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.ide.api/META-INF/MANIFEST.MF index 1b980ef..93a39de 100644 --- a/plugins/org.eclipse.osee.framework.server.ide.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.server.ide.api/META-INF/MANIFEST.MF
@@ -5,7 +5,10 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: javax.ws.rs, +Import-Package: javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, + javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.util,
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 86a28370..c50bca4 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.framework.skynet.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.11.0", org.hamcrest.core, org.mockito;visibility:=reexport,
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 3de3d44..18bc803 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
@@ -46,7 +46,9 @@ org.eclipse.osee.framework.skynet.core.validation, org.eclipse.osee.framework.skynet.core.word Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: com.fasterxml.jackson.core.type, +Import-Package: javax.xml.bind, + javax.xml.bind.annotation, + com.fasterxml.jackson.core.type, com.fasterxml.jackson.databind, com.google.common.base, com.google.common.collect, @@ -86,5 +88,5 @@ org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact, org.osgi.service.event -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml
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 2442269..0b0ffbe 100644 --- a/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.templates/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 89bb292..a57e66e 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 a62f1c5..85c5df1 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.core.commands, org.eclipse.core.runtime, org.eclipse.draw2d,
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 4472044..9f01f34 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
@@ -12,8 +12,8 @@ org.eclipse.core.resources, org.eclipse.osee.framework.plugin.core, org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.ui.console, org.eclipse.ui.forms, @@ -38,4 +38,4 @@ org.junit, org.junit.rules, org.junit.runners.model -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 85dbcbc..20481f6 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-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 6e58f10..a337cab 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.framework.ui.skynet -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.framework.ui.skynet Import-Package: org.eclipse.nebula.widgets.xviewer.core.model, org.apache.cxf.jaxrs.client,
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 dd134b7..5d8e7fb 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
@@ -17,6 +17,9 @@ com.lowagie.text.html, com.lowagie.text.pdf, com.lowagie.text.rtf, + javax.activation, + javax.xml.bind, + javax.xml.bind.annotation, javax.mail, javax.mail.internet, javax.ws.rs, @@ -179,7 +182,7 @@ org.osgi.service.event, org.osgi.service.packageadmin, org.osgi.service.prefs -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.framework.ui.skynet, org.eclipse.osee.framework.ui.skynet.Import, org.eclipse.osee.framework.ui.skynet.access, @@ -243,7 +246,6 @@ org.eclipse.osee.framework.ui.skynet.util.matrix, org.eclipse.osee.framework.ui.skynet.widgets, org.eclipse.osee.framework.ui.skynet.widgets.builder, - org.eclipse.osee.framework.ui.skynet.widgets.cellEditor, org.eclipse.osee.framework.ui.skynet.widgets.checkbox, org.eclipse.osee.framework.ui.skynet.widgets.checkbox.images, org.eclipse.osee.framework.ui.skynet.widgets.dialog,
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 6fb515a..81fd72d 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
@@ -7,12 +7,13 @@ Bundle-Activator: org.eclipse.osee.framework.ui.swt.internal.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, - org.eclipse.ui.forms + org.eclipse.ui.forms, + org.eclipse.swt 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.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.logging
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 e309f63..27b3a5a 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 @@ org.eclipse.osee.framework.plugin.core, org.eclipse.osee.framework.ui.plugin, org.eclipse.ui.navigator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.framework.ui.ws Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.icteam.common.clientserver/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.icteam.common.clientserver/META-INF/MANIFEST.MF index e4cbd66..1584e60 100644 --- a/plugins/org.eclipse.osee.icteam.common.clientserver/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.icteam.common.clientserver/META-INF/MANIFEST.MF
@@ -8,7 +8,10 @@ Bundle-Vendor: BOSCH Export-Package: org.eclipse.osee.icteam.common.clientserver, org.eclipse.osee.icteam.common.clientserver.util -Import-Package: com.google.gson, +Import-Package: javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, + com.google.gson, org.eclipse.core.runtime, org.eclipse.osee.framework.core, org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.icteam.web.rest.layer/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.icteam.web.rest.layer/META-INF/MANIFEST.MF index e53006a..b948ce6 100644 --- a/plugins/org.eclipse.osee.icteam.web.rest.layer/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.icteam.web.rest.layer/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Import-Package: com.google.common.util.concurrent, com.google.gson, flexjson, + javax.activation, javax.mail, javax.mail.internet, javax.ws.rs,
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 1ad6ab3..b4eb18d 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.jaxrs.server -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport Import-Package: org.junit,
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 aef45d7..5ef791b 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.jaxrs.server;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Osee-Template: OSEE-INF/templates/*.html Import-Package: com.fasterxml.jackson.core, @@ -14,6 +14,9 @@ com.fasterxml.jackson.jaxrs.json, com.google.common.cache, com.google.common.io, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, javax.annotation, javax.annotation.security, javax.servlet,
diff --git a/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF index da81d3d..45dc9e7 100644 --- a/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.core, @@ -17,6 +17,9 @@ com.fasterxml.jackson.jaxrs.json, com.fasterxml.jackson.jaxrs.json.annotation, com.google.common.cache, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, javax.ws.rs, javax.ws.rs.client, javax.ws.rs.core,
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 c338309..fbc4973 100644 --- a/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jdbc.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.jdbc -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.mockito;visibility:=reexport, org.hamcrest.core
diff --git a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF index 4012d9b..cbe192f 100644 --- a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.jdbc;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Import-Package: com.fasterxml.jackson.core, com.fasterxml.jackson.databind,
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 92ed4f0..544c963 100644 --- a/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logback.config/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: ch.qos.logback.classic;bundle-version="0.9.27" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11
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 eb0e446..b7595e5 100644 --- a/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logger.slf4j/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ org.osgi.service.component, org.osgi.service.log, org.slf4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF index 12078de..a46995f 100644 --- a/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.logger/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 0122920..da9048b 100644 --- a/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail.api/META-INF/MANIFEST.MF
@@ -4,14 +4,18 @@ Bundle-SymbolicName: org.eclipse.osee.mail.api;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: javax.mail, +Import-Package: javax.activation, + javax.mail, javax.mail.internet, javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.framework.jdk.core.util.windows + org.eclipse.osee.framework.jdk.core.util.windows, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation Export-Package: org.eclipse.osee.mail.api
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 def63de..d232dcb 100644 --- a/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail.test/META-INF/MANIFEST.MF
@@ -5,11 +5,12 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.mail -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport -Import-Package: org.junit, +Import-Package: javax.activation, + org.junit, org.junit.rules, org.junit.runner, org.junit.runners
diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/internal/MailUtilsTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/internal/MailUtilsTest.java index ece8cb7..2d65efe 100644 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/internal/MailUtilsTest.java +++ b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/internal/MailUtilsTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.activation.DataSource; @@ -114,16 +115,16 @@ @org.junit.Test public void testCreateOutlookEvent() throws Exception { - checkOutlookEvent("Daily+SCRUM.vcs", "Daily SCRUM", "Meeting room 220.", "01/31/2011 09:45 AM, PDT", - "01/31/2011 10:00 AM, PDT"); + checkOutlookEvent("Daily+SCRUM.vcs", "Daily SCRUM", "Meeting room 220.", "01/31/2011, 09:45 AM, PDT", + "01/31/2011, 10:00 AM, PDT"); String fileName1 = "Discuss+what+to+do+about+the+ant+problem+in+the+break+room..vcs"; checkOutlookEvent(fileName1, "Discuss what to do about the ant problem in the break room.", "Joe Schmoe's Desk", - "12/31/2300 00:00 AM, PDT", "12/31/2300 11:59 PM, PDT"); + "12/31/2300, 00:00 AM, PDT", "12/31/2300, 11:59 PM, PDT"); checkOutlookEvent(fileName1, "Discuss what to do about the ant problem in the break room.", "Joe Schmoe's Desk", - "12/31/2300 11:58 PM, PDT", "12/31/2300 11:59 PM, PDT"); + "12/31/2300, 11:58 PM, PDT", "12/31/2300, 11:59 PM, PDT"); } @org.junit.Test @@ -131,7 +132,7 @@ String fileName1 = "Testing%21%40%23%24%25%5E+%26+%28+%29+_+%2B+1234567890-%3D%60%7E%7D%7B%5B%5D%2C.%3B%27.vcs"; checkOutlookEvent(fileName1, "Testing!@#$%^ & ( ) _ + 1234567890-=`~}{[],.;'", - "!@#$%^ & ( ) _ + 1234567890-=`~}{[],.;'", "01/31/2011 09:45 AM, PDT", "01/31/2011 10:00 AM, PDT"); + "!@#$%^ & ( ) _ + 1234567890-=`~}{[],.;'", "01/31/2011, 09:45 AM, PDT", "01/31/2011, 10:00 AM, PDT"); } @org.junit.Test(expected = UnsupportedOperationException.class) @@ -147,7 +148,17 @@ } private static void checkOutlookEvent(String filename, String eventName, String location, String startDateStr, String endDateStr) throws Exception { + DateFormat DFormat + = DateFormat.getInstance(); + System.out.println("Object: " + DFormat); + + // String formatting + String str = DFormat.format(new Date()); + + // Displaying the string time Date startDate = DateFormat.getInstance().parse(startDateStr); + + Date endDate = DateFormat.getInstance().parse(endDateStr); DataSource source = MailUtils.createOutlookEvent(eventName, location, startDate, endDate);
diff --git a/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF index a488394..afe1f3c 100644 --- a/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.mail/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: javax.activation, +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: javax.activation +Import-Package: javax.ws.rs, + javax.ws.rs.core, javax.mail, javax.mail.event, javax.mail.internet, - javax.ws.rs, - javax.ws.rs.core, org.eclipse.osee.framework.core.executor, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.jdk.core.util,
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 ca2bbfd..f9e0d13 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.account.admin;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: com.fasterxml.jackson.core,
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 53232f9..ff65840 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.mockito;visibility:=reexport, org.hamcrest.core Import-Package: com.google.common.util.concurrent,
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 dc309f9..dfd3996 100644 --- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -5,8 +5,9 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml +Require-Bundle: org.antlr.runtime Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.core, com.fasterxml.jackson.core.util, @@ -17,7 +18,6 @@ com.google.common.base, com.google.common.collect, com.google.common.io, - org.antlr.runtime, org.eclipse.core.runtime, org.eclipse.emf.common.util, org.eclipse.emf.ecore,
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 a4cf52b..1a26209 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.db -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF index 7701a15..fef7c8e 100644 --- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Import-Package: com.google.common.base, com.google.common.collect,
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml index 151525a..781055f 100644 --- a/plugins/org.eclipse.osee.orcs.parent/pom.xml +++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -27,7 +27,8 @@ </activation> <modules> <module>../../plugins/org.eclipse.osee.framework.core</module> - <module>../../plugins/org.eclipse.osee.framework.core.test</module> + <module>../../plugins/org.eclipse.osee.framework.core.test</module> + <module>../../plugins/org.eclipse.osee.framework.core.model</module> <module>../../plugins/org.eclipse.osee.framework.core.model.test</module> <module>../../plugins/org.eclipse.osee.framework.resource.management</module> @@ -37,7 +38,7 @@ <module>../../plugins/org.eclipse.osee.orcs</module> <module>../../plugins/org.eclipse.osee.orcs.core</module> - <module>../../plugins/org.eclipse.osee.orcs.core.test</module> + <module>../../plugins/org.eclipse.osee.orcs.core.test</module> <module>../../plugins/org.eclipse.osee.orcs.db</module> <module>../../plugins/org.eclipse.osee.orcs.db.test</module> <module>../../plugins/org.eclipse.osee.orcs.rest.model</module> @@ -64,7 +65,9 @@ </activation> <modules> <module>../../plugins/org.eclipse.osee.framework.core</module> - <module>../../plugins/org.eclipse.osee.framework.core.test</module> + + <module>../../plugins/org.eclipse.osee.framework.core.test</module> + <module>../../plugins/org.eclipse.osee.framework.core.model</module> <module>../../plugins/org.eclipse.osee.framework.core.model.test</module> <module>../../plugins/org.eclipse.osee.framework.resource.management</module> @@ -74,7 +77,7 @@ <module>../../plugins/org.eclipse.osee.orcs</module> <module>../../plugins/org.eclipse.osee.orcs.core</module> - <module>../../plugins/org.eclipse.osee.orcs.core.test</module> + <module>../../plugins/org.eclipse.osee.orcs.core.test</module> <module>../../plugins/org.eclipse.osee.orcs.db</module> <module>../../plugins/org.eclipse.osee.orcs.db.test</module> <module>../../plugins/org.eclipse.osee.orcs.rest.model</module>
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 39909ca..44a3235 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
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.rest.client;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml Import-Package: javax.ws.rs,
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 5b5213f..74e4ae1 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact, org.eclipse.osee.orcs.rest.model.writer, @@ -15,6 +15,9 @@ com.fasterxml.jackson.databind.annotation, javax.ws.rs, javax.ws.rs.core, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, org.apache.cxf.jaxrs.ext.multipart, org.eclipse.osee.framework.core.applicability, org.eclipse.osee.framework.core.data,
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 ea75fac..0cbd9ac 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
@@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.osee.orcs.rest -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.junit, org.mockito;visibility:=reexport
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 1322b2c..a7730d1 100644 --- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
@@ -5,13 +5,16 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Service-Component: OSGI-INF/*.xml Import-Package: com.fasterxml.jackson.core, com.fasterxml.jackson.databind, com.google.common.base, com.google.common.collect, com.google.common.net, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, javax.ws.rs, javax.ws.rs.container, javax.ws.rs.core,
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 402d7f8..eb8d8ad 100644 --- a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core, org.mockito;visibility:=reexport Import-Package: com.google.common.base,
diff --git a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF index a99c1ba..4fe2d10 100644 --- a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF
@@ -5,10 +5,13 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.databind.annotation, javax.ws.rs.core, + javax.xml, + javax.xml.bind, + javax.xml.bind.annotation, org.eclipse.osee.activity.api, org.eclipse.osee.framework.core, org.eclipse.osee.framework.core.access,
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 0986e9f..e541a48 100644 --- a/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF
@@ -22,10 +22,11 @@ org.eclipse.osee.ote.define.parser.handlers, org.eclipse.osee.ote.define.utilities Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.ws.rs.core, org.apache.commons.lang, org.eclipse.jdt.annotation, + org.eclipse.osee.framework.skynet.core.artifact, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.enums.token,
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 6b30ebf..605454a 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,9 +31,12 @@ 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.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.lowagie.text, org.apache.commons.lang, + org.eclipse.jface.action, + org.eclipse.jface.resource, + org.eclipse.jface.viewers, org.eclipse.nebula.widgets.xviewer.core.model, org.eclipse.osee.ats.api.data, org.eclipse.osee.framework.core,
diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml index 06a7ed6..7b34aa4 100644 --- a/plugins/org.eclipse.osee.parent/pom.xml +++ b/plugins/org.eclipse.osee.parent/pom.xml
@@ -25,8 +25,8 @@ <git-repo-root>file:../../..</git-repo-root> <build-alias>-DEV</build-alias> - <tycho-version>0.22.0</tycho-version> - <tycho-extras-version>0.22.0</tycho-extras-version> + <tycho-version>1.7.0</tycho-version> + <tycho-extras-version>1.7.0</tycho-extras-version> <maven-antrun-version>1.6</maven-antrun-version> <ant-contrib-version>1.0b3</ant-contrib-version> @@ -89,7 +89,36 @@ <url>http://www.eclipse.org/osee</url> </organization> + <dependencies> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.1</version> + </dependency> + + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> +</dependency> +<!-- Runtime, com.sun.xml.bind module --> +<dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> +</dependency> + </dependencies> <!-- <pluginRepositories> --> <!-- <pluginRepository> --> @@ -136,16 +165,7 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> + <environment> <os>linux</os> <ws>gtk</ws> @@ -180,16 +200,8 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> + + <environment> <os>linux</os> <ws>gtk</ws>
diff --git a/plugins/org.eclipse.osee.runtime.parent/pom.xml b/plugins/org.eclipse.osee.runtime.parent/pom.xml index 0f908d6..cf3e404 100644 --- a/plugins/org.eclipse.osee.runtime.parent/pom.xml +++ b/plugins/org.eclipse.osee.runtime.parent/pom.xml
@@ -16,6 +16,24 @@ <name>OSEE Runtime - Parent (Incubation)</name> <version>1.0.0-SNAPSHOT</version> +<dependencies> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.1</version> + </dependency> + </dependencies> + <modules> <module>../../features/org.eclipse.osee.core.runtime.feature</module> @@ -24,7 +42,6 @@ <module>../../features/org.eclipse.osee.core.plugin.feature</module> <module>../../plugins/org.eclipse.osee.framework.messaging</module> - <module>../../plugins/org.eclipse.osee.framework.messaging.test</module> <module>../../plugins/org.eclipse.osee.framework.plugin.core</module>
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 6da3c39..d7c635a 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-SymbolicName: org.eclipse.osee.support.test.util;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 15344a3..3e1e2f7 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
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.template.engine -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.mockito;visibility:=reexport Import-Package: 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 417b204..360f92e 100644 --- a/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.template.engine/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.template.engine;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.framework.jdk.core.type,
diff --git a/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF index c9bd441..7102e05 100644 --- a/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.vcast/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.osee.vcast;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 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 5664ae8..a769ed1 100644 --- a/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.web.ui/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-SymbolicName: org.eclipse.osee.web.ui;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Open System Engineering Environment Osee-JaxRs-Resource: /src/*;path=/;secure=false
diff --git a/plugins/org.postgresql.driver/pom.xml b/plugins/org.postgresql.driver/pom.xml index bc6c9a8..f6840d5 100644 --- a/plugins/org.postgresql.driver/pom.xml +++ b/plugins/org.postgresql.driver/pom.xml
@@ -14,7 +14,7 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> - <version>0.22.0</version> + <version>1.7.0</version> <extensions>true</extensions> </plugin> </plugins>