Skip to content

Commit 0422ac9

Browse files
authored
add jstl to JSP library and servlet group (#1548)
1 parent 90e1d23 commit 0422ac9

2 files changed

Lines changed: 25 additions & 8 deletions

File tree

plugins/com.google.cloud.tools.eclipse.appengine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/AppEngineLibrariesInPluginXmlTest.java

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,23 +230,37 @@ public void testJspApiLibraryConfig() throws URISyntaxException {
230230
assertNotNull(jspApiLibrary.getLibraryDependencies());
231231
assertTrue(jspApiLibrary.getLibraryDependencies().isEmpty());
232232

233-
assertThat(jspApiLibrary.getLibraryFiles().size(), is(1));
234-
LibraryFile libraryFile = jspApiLibrary.getLibraryFiles().get(0);
235-
assertThat(libraryFile.getJavadocUri(), is(new URI(
233+
assertThat(jspApiLibrary.getLibraryFiles().size(), is(2));
234+
LibraryFile jspApi = jspApiLibrary.getLibraryFiles().get(0);
235+
assertThat(jspApi.getJavadocUri(), is(new URI(
236236
"http://docs.oracle.com/cd/E17802_01/products/products/jsp/2.1/docs/jsp-2_1-pfd2/")));
237-
assertNull(libraryFile.getSourceUri());
237+
assertNull(jspApi.getSourceUri());
238238

239-
assertNotNull(libraryFile.getMavenCoordinates());
240-
MavenCoordinates mavenCoordinates = libraryFile.getMavenCoordinates();
239+
assertNotNull(jspApi.getMavenCoordinates());
240+
MavenCoordinates mavenCoordinates = jspApi.getMavenCoordinates();
241241
assertThat(mavenCoordinates.getRepository(), is("central"));
242242
assertThat(mavenCoordinates.getGroupId(), is("javax.servlet.jsp"));
243243
assertThat(mavenCoordinates.getArtifactId(), is("jsp-api"));
244244
assertThat(mavenCoordinates.getVersion(), is("2.1"));
245245
assertThat(mavenCoordinates.getType(), is("jar"));
246246
assertNull(mavenCoordinates.getClassifier());
247247

248-
assertNotNull(libraryFile.getFilters());
249-
assertTrue(libraryFile.getFilters().isEmpty());
248+
assertTrue(jspApi.getFilters().isEmpty());
249+
250+
LibraryFile jstlApi = jspApiLibrary.getLibraryFiles().get(1);
251+
assertThat(jstlApi.getJavadocUri(), is(new URI("https://jstl.java.net/")));
252+
assertNull(jstlApi.getSourceUri());
253+
254+
assertNotNull(jstlApi.getMavenCoordinates());
255+
MavenCoordinates jstlCoordinates = jstlApi.getMavenCoordinates();
256+
assertThat(jstlCoordinates.getRepository(), is("central"));
257+
assertThat(jstlCoordinates.getGroupId(), is("javax.servlet"));
258+
assertThat(jstlCoordinates.getArtifactId(), is("jstl"));
259+
assertThat(jstlCoordinates.getVersion(), is("1.2"));
260+
assertThat(jstlCoordinates.getType(), is("jar"));
261+
assertNull(jstlCoordinates.getClassifier());
262+
263+
assertTrue(jstlApi.getFilters().isEmpty());
250264
}
251265

252266
}

plugins/com.google.cloud.tools.eclipse.appengine.libraries/plugin.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
groupId="javax.servlet.jsp"
9393
version="2.1" />
9494
</libraryFile>
95+
<libraryFile javadocUri="https://jstl.java.net/">
96+
<mavenCoordinates artifactId="jstl" groupId="javax.servlet" version="1.2" />
97+
</libraryFile>
9598
</library>
9699
</extension>
97100

0 commit comments

Comments
 (0)