Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbroberts2021-01-18 03:07:13 +0000
committerBaily Roberts2021-01-18 19:08:46 +0000
commit1fd26c08dfdc0cb5c729c93975dcdbc52be9a644 (patch)
tree76e99c039a81d1eb1b2cccce002413b4517adfb5
parent851e7477b4ccb4e982a9913346317a6d73a6eacb (diff)
downloadorg.eclipse.osee-1fd26c08dfdc0cb5c729c93975dcdbc52be9a644.tar.gz
org.eclipse.osee-1fd26c08dfdc0cb5c729c93975dcdbc52be9a644.tar.xz
org.eclipse.osee-1fd26c08dfdc0cb5c729c93975dcdbc52be9a644.zip
feature[TW18497]: Update jetty to newest version
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/feature.xml19
-rw-r--r--features/org.eclipse.osee.dep.feature/feature.xml23
-rw-r--r--features/org.eclipse.osee.framework.feature/feature.xml49
-rw-r--r--plugins/org.eclipse.osee.dep.parent/pom.xml8
-rw-r--r--plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target50
5 files changed, 105 insertions, 44 deletions
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 976e6d20868..2eda4491f66 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -486,44 +486,49 @@
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
-
+ <plugin
+ id="org.eclipse.jetty.util.ajax"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
<plugin
id="org.apache.felix.gogo.command"
download-size="0"
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index fad4b3419a8..43fa160cfdc 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -466,42 +466,42 @@
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false" />
<plugin
@@ -1999,7 +1999,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+ <plugin
+ id="org.eclipse.jetty.util.ajax"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
<plugin
id="org.apache.batik.xml"
download-size="0"
@@ -2122,7 +2127,7 @@
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
@@ -2136,7 +2141,7 @@
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.35"
unpack="false"/>
<plugin
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml
index f853a0baf99..b5a797a8177 100644
--- a/features/org.eclipse.osee.framework.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.feature/feature.xml
@@ -262,5 +262,54 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+<plugin
+ id="org.eclipse.jetty.http"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.io"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.security"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.server"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.servlet"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.util"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.util.ajax"
+ download-size="0"
+ install-size="0"
+ version="9.4.35"
+ unpack="false"/>
</feature>
diff --git a/plugins/org.eclipse.osee.dep.parent/pom.xml b/plugins/org.eclipse.osee.dep.parent/pom.xml
index 6c0eadc6125..aa968f73917 100644
--- a/plugins/org.eclipse.osee.dep.parent/pom.xml
+++ b/plugins/org.eclipse.osee.dep.parent/pom.xml
@@ -74,7 +74,13 @@
</organization>
<repositories>
-
+
+ <repository>
+ <id>jetty</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.35.v20201120/</url>
+ </repository>
+
<repository>
<id>mylyn2</id>
<layout>p2</layout>
diff --git a/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target b/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
index db8df8a8860..7a2a767197f 100644
--- a/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
+++ b/plugins/org.eclipse.osee.support.config/ClientServerTargetPlatform.target
@@ -24,7 +24,7 @@
<plugin id="com.google.gerrit.common"/>
<plugin id="com.google.gerrit.prettify"/>
<plugin id="com.google.gerrit.reviewdb"/>
-<plugin id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<plugin id="com.google.guava"/>
<plugin id="com.google.gwt.servlet"/>
<plugin id="com.google.gwtjsonrpc"/>
<plugin id="com.google.gwtorm"/>
@@ -45,15 +45,15 @@
<plugin id="javaewah"/>
<plugin id="javax.activation"/>
<plugin id="javax.activation.source"/>
-<plugin id="javax.annotation"/>
-<plugin id="javax.annotation.source"/>
+<plugin id="javax.annotation" version="1.2.0.v201709271724-DEV"/>
+<plugin id="javax.annotation.source" version="1.2.0.v201709271724-DEV"/>
<plugin id="javax.el"/>
<plugin id="javax.el.source"/>
<plugin id="javax.inject"/>
<plugin id="javax.inject.source"/>
<plugin id="javax.mail.glassfish"/>
<plugin id="javax.mail.glassfish.source"/>
-<plugin id="javax.servlet" version="3.1.0.v201410161800"/>
+<plugin id="javax.servlet"/>
<plugin id="javax.servlet.jsp"/>
<plugin id="javax.servlet.jsp.source"/>
<plugin id="javax.servlet.source"/>
@@ -82,8 +82,8 @@
<plugin id="org.apache.batik.css.source"/>
<plugin id="org.apache.batik.util.source"/>
<plugin id="org.apache.commons.cli"/>
-<plugin id="org.apache.commons.codec"/>
-<plugin id="org.apache.commons.codec.source"/>
+<plugin id="org.apache.commons.codec" version="1.9.0.v201709181954-DEV"/>
+<plugin id="org.apache.commons.codec.source" version="1.9.0.v201709181954-DEV"/>
<plugin id="org.apache.commons.compress"/>
<plugin id="org.apache.commons.dbcp"/>
<plugin id="org.apache.commons.dbcp.source"/>
@@ -478,19 +478,14 @@
<plugin id="org.eclipse.jdt.launching.source"/>
<plugin id="org.eclipse.jdt.ui"/>
<plugin id="org.eclipse.jem.util"/>
-<plugin id="org.eclipse.jetty.continuation"/>
-<plugin id="org.eclipse.jetty.continuation.source"/>
-<plugin id="org.eclipse.jetty.http.source"/>
-<plugin id="org.eclipse.jetty.io"/>
-<plugin id="org.eclipse.jetty.io.source"/>
-<plugin id="org.eclipse.jetty.security"/>
-<plugin id="org.eclipse.jetty.security.source"/>
-<plugin id="org.eclipse.jetty.server"/>
-<plugin id="org.eclipse.jetty.server.source"/>
-<plugin id="org.eclipse.jetty.servlet"/>
-<plugin id="org.eclipse.jetty.servlet.source"/>
-<plugin id="org.eclipse.jetty.util"/>
-<plugin id="org.eclipse.jetty.util.source"/>
+<plugin id="org.eclipse.jetty.io" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.security" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.security.source" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.server" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.server.source" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.servlet" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.servlet.source" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.util" version="9.4.35.v20201120"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.databinding.source"/>
@@ -766,8 +761,8 @@
<plugin id="rest.assured"/>
<plugin id="rest.assured.source"/>
<plugin id="org.eclipse.jdt.annotation.source" version="2.2.0.v20180417-0931"/>
-<plugin id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
-<plugin id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
+<plugin id="org.objectweb.asm"/>
+<plugin id="org.objectweb.asm.tree"/>
<plugin id="org.objectweb.asm.tree.source"/>
<plugin id="org.apache.felix.scr"/>
<plugin id="org.apache.felix.scr.source"/>
@@ -789,8 +784,8 @@
<plugin id="org.eclipse.xtext.ui.testing"/>
<plugin id="org.eclipse.xtext.ui.codetemplates.ide"/>
<plugin id="com.google.gson"/>
-<plugin id="com.google.guava" version="15.0.0.v201403281430"/>
-<plugin id="javax.servlet" version="3.0.0.v201112011016"/>
+<plugin id="com.google.guava"/>
+<plugin id="javax.servlet"/>
<plugin id="org.eclipse.xtext.common.types"/>
<plugin id="org.eclipse.mylyn.tasks.core"/>
<plugin id="org.eclipse.mylyn.tasks.ui"/>
@@ -831,12 +826,12 @@
<plugin id="lpg.runtime.java"/>
<plugin id="org.eclipse.ocl.common"/>
<plugin id="org.eclipse.jdt.annotation" version="2.2.0.v20180417-0931"/>
-<plugin id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
+<plugin id="org.apache.lucene.core"/>
<plugin id="org.eclipse.help.base"/>
<plugin id="org.eclipse.help.base.source"/>
-<plugin id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
+<plugin id="org.apache.lucene.analyzers-common"/>
<plugin id="org.apache.lucene.analyzers-smartcn"/>
-<plugin id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
+<plugin id="org.apache.lucene.core"/>
<plugin id="org.eclipse.e4.ui.workbench"/>
<plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
@@ -856,7 +851,8 @@
<plugin id="org.eclipse.jgit.lfs"/>
<plugin id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
<plugin id="org.eclipse.equinox.http.jetty"/>
- <plugin id="org.eclipse.jetty.http"/>
+ <plugin id="org.eclipse.jetty.http" version="9.4.35.v20201120"/>
+ <plugin id="org.eclipse.jetty.util.ajax"/>
</includeBundles>
<environment>
<os>win32</os>

Back to the top