diff options
| author | Nitin Dahyabhai | 2021-01-13 01:51:22 +0000 |
|---|---|---|
| committer | Nitin Dahyabhai | 2021-01-13 02:22:27 +0000 |
| commit | 142b6b33027204646b1ba88ca1a00e6b670411f2 (patch) | |
| tree | 861a5403de34205ac79c8125488d340ba2b0f6cf | |
| parent | d6c0cc1939be25e3b87e9e560e7e5a8a0a30d0a3 (diff) | |
| download | webtools.webservices-142b6b33027204646b1ba88ca1a00e6b670411f2.tar.gz webtools.webservices-142b6b33027204646b1ba88ca1a00e6b670411f2.tar.xz webtools.webservices-142b6b33027204646b1ba88ca1a00e6b670411f2.zip | |
[565454] Include Jakarta EE 9 web Schemas and DTDs in XML Catalog
Change-Id: I115529993b344b4770d5306747191ad6401e7433
4 files changed, 23 insertions, 5 deletions
diff --git a/core/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF index 0d6ac051b..cd9c4dd0a 100644 --- a/core/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF +++ b/core/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.jst.ws.jaxrs.core;singleton:=true -Bundle-Version: 1.0.850.qualifier +Bundle-Version: 1.0.851.qualifier Bundle-Activator: org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.100,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.100,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)", - org.eclipse.jst.j2ee.web;bundle-version="[1.1.400,1.2.0)", + org.eclipse.jst.j2ee.web;bundle-version="[1.1.400,2.0.0)", org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)", - org.eclipse.jst.j2ee;bundle-version="[1.1.400,1.3.0)", + org.eclipse.jst.j2ee;bundle-version="[1.1.400,2.0.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.2.0,2.0.0)", org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)", org.eclipse.ui;bundle-version="[3.6.0,4.0.0)";resolution:=optional, diff --git a/core/bundles/org.eclipse.jst.ws.jaxrs.core/pom.xml b/core/bundles/org.eclipse.jst.ws.jaxrs.core/pom.xml index a918a41e6..fb243d55b 100644 --- a/core/bundles/org.eclipse.jst.ws.jaxrs.core/pom.xml +++ b/core/bundles/org.eclipse.jst.ws.jaxrs.core/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.jaxrs.core</artifactId>
- <version>1.0.850-SNAPSHOT</version>
+ <version>1.0.851-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml index 64ab68e53..a20a2c7be 100644 --- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml +++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml @@ -39,4 +39,23 @@ <import plugin="org.eclipse.jst.standard.schemas"/> </requires> + <plugin + id="jakarta.el" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="jakarta.servlet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="jakarta.servlet.jsp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/jaxws/tests/org.eclipse.jst.ws.cxf.tests/pom.xml b/jaxws/tests/org.eclipse.jst.ws.cxf.tests/pom.xml index 79dfe4cd5..5e319054e 100644 --- a/jaxws/tests/org.eclipse.jst.ws.cxf.tests/pom.xml +++ b/jaxws/tests/org.eclipse.jst.ws.cxf.tests/pom.xml @@ -39,7 +39,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho.version}</version> <configuration> - <argLine>-XX:MaxPermSize=128m</argLine> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> <useJDK>BREE</useJDK> |