From 04941fd44cd9f43e2f5dc4615635b9d5b5d36d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=83=D1=85=D0=BE=D0=B2?= Date: Tue, 11 Sep 2018 07:57:48 +0200 Subject: [PATCH 1/2] Issue #2691 replace static dn by subtee based ldap lookup for an entry inside _userBaseDn (#2842) * replace static dn by subtee based ldap lookup for an entry inside _userBaseDn * additional ldap tests to cover enhancement of #2842 Signed-off-by: Alexei Pastuchov --- .../jetty/jaas/spi/LdapLoginModule.java | 50 ++++++++----- .../jetty/jaas/JAASLdapLoginServiceTest.java | 75 +++++++++++++++++-- 2 files changed, 101 insertions(+), 24 deletions(-) diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java index cea5e99591c..49f1a99a895 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java @@ -329,9 +329,16 @@ public class LdapLoginModule extends AbstractLoginModule } } - String userDn = _userRdnAttribute + "=" + rdnValue + "," + _userBaseDn; + String filter = "({0}={1})"; - return getUserRolesByDn(dirContext, userDn); + Object[] filterArguments = new Object[]{ + _userRdnAttribute, + rdnValue + }; + + SearchResult searchResult = findUser(dirContext, filter, filterArguments); + + return getUserRolesByDn(dirContext, searchResult.getNameInNamespace()); } private List getUserRolesByDn(DirContext dirContext, String userDn) throws NamingException @@ -547,11 +554,6 @@ public class LdapLoginModule extends AbstractLoginModule private SearchResult findUser(String username) throws LoginException { - SearchControls ctls = new SearchControls(); - ctls.setCountLimit(1); - ctls.setDerefLinkFlag(true); - ctls.setSearchScope(SearchControls.SUBTREE_SCOPE); - String filter = "(&(objectClass={0})({1}={2}))"; if (LOG.isDebugEnabled()) @@ -563,24 +565,36 @@ public class LdapLoginModule extends AbstractLoginModule username }; + return findUser(_rootContext, filter, filterArguments); + } + + private SearchResult findUser(DirContext dirContext, String filter, Object[] filterArguments) throws LoginException + { + SearchControls ctls = new SearchControls(); + ctls.setDerefLinkFlag(true); + ctls.setSearchScope(SearchControls.SUBTREE_SCOPE); + + NamingEnumeration results; try { - NamingEnumeration results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls); - - if (LOG.isDebugEnabled()) - LOG.debug("Found user?: " + results.hasMoreElements()); - - if (!results.hasMoreElements()) - { - throw new FailedLoginException("User not found."); - } - - return results.nextElement(); + results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls); } catch (NamingException ne) { throw new FailedLoginException(ne.getMessage()); } + + if (LOG.isDebugEnabled()) + LOG.debug("Found user?: " + results.hasMoreElements()); + + if (!results.hasMoreElements()) + throw new FailedLoginException("User not found."); + + SearchResult searchResult = (SearchResult)results.nextElement(); + if (results.hasMoreElements()) + throw new FailedLoginException("Search result contains ambiguous entries"); + + return searchResult; } diff --git a/jetty-jaas/src/test/java/org/eclipse/jetty/jaas/JAASLdapLoginServiceTest.java b/jetty-jaas/src/test/java/org/eclipse/jetty/jaas/JAASLdapLoginServiceTest.java index 62261b02201..addc8252856 100644 --- a/jetty-jaas/src/test/java/org/eclipse/jetty/jaas/JAASLdapLoginServiceTest.java +++ b/jetty-jaas/src/test/java/org/eclipse/jetty/jaas/JAASLdapLoginServiceTest.java @@ -58,13 +58,13 @@ import static org.junit.Assert.*; "objectClass: top", "ou: people", // Entry # 2 - "dn:uid=someone, ou=people,dc=jetty,dc=org", + "dn:uid=someone,ou=people,dc=jetty,dc=org", "objectClass: inetOrgPerson", "cn: someone", "sn: sn test", "userPassword: complicatedpassword", // Entry # 3 - "dn:uid=someoneelse, ou=people,dc=jetty,dc=org", + "dn:uid=someoneelse,ou=people,dc=jetty,dc=org", "objectClass: inetOrgPerson", "cn: someoneelse", "sn: sn test", @@ -75,27 +75,67 @@ import static org.junit.Assert.*; "objectClass: top", "ou: groups", // Entry 5 + "dn: ou=subdir,ou=people,dc=jetty,dc=org", + "objectClass: organizationalunit", + "objectClass: top", + "ou: subdir", + // Entry # 6 + "dn:uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org", + "objectClass: inetOrgPerson", + "cn: uniqueuser", + "sn: unique user", + "userPassword: hello123", + // Entry # 7 + "dn:uid=ambiguousone,ou=people,dc=jetty,dc=org", + "objectClass: inetOrgPerson", + "cn: ambiguous1", + "sn: ambiguous user", + "userPassword: foobar", + // Entry # 8 + "dn:uid=ambiguousone,ou=subdir,ou=people,dc=jetty,dc=org", + "objectClass: inetOrgPerson", + "cn: ambiguous2", + "sn: ambiguous subdir user", + "userPassword: barfoo", + // Entry 9 "dn: cn=developers,ou=groups,dc=jetty,dc=org", "objectClass: groupOfUniqueNames", "objectClass: top", "ou: groups", "description: People who try to build good software", - "uniquemember: uid=someone, ou=people, dc=jetty,dc=org", + "uniquemember: uid=someone,ou=people,dc=jetty,dc=org", + "uniquemember: uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org", "cn: developers", - // Entry 6 + // Entry 10 "dn: cn=admin,ou=groups,dc=jetty,dc=org", "objectClass: groupOfUniqueNames", "objectClass: top", "ou: groups", "description: People who try to run software build by developers", - "uniquemember: uid=someone, ou=people, dc=jetty,dc=org", - "uniquemember: uid=someoneelse, ou=people, dc=jetty,dc=org", + "uniquemember: uid=someone,ou=people,dc=jetty,dc=org", + "uniquemember: uid=someoneelse,ou=people,dc=jetty,dc=org", + "uniquemember: uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org", "cn: admin" }) public class JAASLdapLoginServiceTest { private static LdapServer _ldapServer; + private JAASLoginService jaasLoginService(String name) { + JAASLoginService ls = new JAASLoginService("foo"); + ls.setCallbackHandlerClass("org.eclipse.jetty.jaas.callback.DefaultCallbackHandler"); + ls.setIdentityService(new DefaultIdentityService()); + ls.setConfiguration(new TestConfiguration(true)); + return ls; + } + + private UserIdentity doLogin(String username, String password) throws Exception + { + JAASLoginService ls = jaasLoginService("foo"); + Request request = new Request(null, null); + return ls.login( username, password, request); + } + public static LdapServer getLdapServer() { return _ldapServer; } @@ -174,4 +214,27 @@ public class JAASLdapLoginServiceTest } + @Test + public void testLdapBindingSubdirUniqueUserName() throws Exception + { + UserIdentity userIdentity = doLogin("uniqueuser", "hello123"); + assertNotNull( userIdentity ); + assertTrue( userIdentity.isUserInRole( "developers", null) ); + assertTrue( userIdentity.isUserInRole( "admin", null) ); + assertFalse( userIdentity.isUserInRole( "blabla", null) ); + } + + @Test + public void testLdapBindingAmbiguousUserName() throws Exception + { + UserIdentity userIdentity = doLogin( "ambiguousone", "foobar"); + assertNull( userIdentity ); + } + + @Test + public void testLdapBindingSubdirAmbiguousUserName() throws Exception + { + UserIdentity userIdentity = doLogin( "ambiguousone", "barfoo"); + assertNull( userIdentity ); + } } From 1b330f2efc3280b128d8d21b1790be1278d1e49f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 11 Sep 2018 21:05:37 +1000 Subject: [PATCH 2/2] inherit plugin versions from main pom (#2897) * inherit plugin versions from main pom Signed-off-by: olivier lamy --- jetty-cdi/pom.xml | 3 - jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 5 +- .../src/it/it-parent-pom/invoker.properties | 1 + .../src/it/it-parent-pom/pom.xml | 146 ++++++++++++++++++ .../src/it/jetty-cdi-run-forked/pom.xml | 24 +-- .../src/it/jetty-deploy-war-mojo-it/pom.xml | 22 +-- .../jetty-simple-base/pom.xml | 6 - .../jetty-simple-webapp/pom.xml | 4 - .../src/it/jetty-run-distro-mojo-it/pom.xml | 55 +------ .../jetty-simple-base/pom.xml | 7 - .../jetty-simple-webapp/pom.xml | 6 - .../src/it/jetty-run-forked-mojo-it/pom.xml | 55 +------ .../jetty-simple-base/pom.xml | 8 - .../jetty-simple-webapp/pom.xml | 7 +- .../src/it/jetty-run-mojo-it/pom.xml | 62 +------- .../jetty-simple-base/pom.xml | 8 - .../jetty-simple-webapp/pom.xml | 11 -- .../it/jetty-run-war-exploded-mojo-it/pom.xml | 56 +------ .../jetty-simple-base/pom.xml | 9 -- .../jetty-simple-webapp/pom.xml | 11 -- .../src/it/jetty-run-war-mojo-it/pom.xml | 56 +------ .../jetty-simple-base/pom.xml | 9 -- .../jetty-simple-webapp/pom.xml | 4 - .../src/it/jetty-start-mojo-it/pom.xml | 56 +------ .../it/run-mojo-gwt-it/beer-server/pom.xml | 7 - .../it/run-mojo-gwt-it/beer-shared/pom.xml | 1 + .../src/it/run-mojo-gwt-it/pom.xml | 22 +-- pom.xml | 39 +++-- 29 files changed, 236 insertions(+), 466 deletions(-) create mode 100644 jetty-maven-plugin/src/it/it-parent-pom/invoker.properties create mode 100644 jetty-maven-plugin/src/it/it-parent-pom/pom.xml diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 0198776bb30..d862017688c 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -10,9 +10,6 @@ Jetty :: CDI :: Parent http://www.eclipse.org/jetty pom - - 2.4.3.Final - cdi-core diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index ee3fc8c778a..cd2eeb1b88d 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -67,7 +67,7 @@ ${project.build.directory}/local-repo src/it/settings.xml - ${surefire.version} + ${maven.surefire.version} ${skipTests} diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 5bf00e0b4f3..c4d02c88a29 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -74,12 +74,15 @@ */pom.xml + + it-parent-pom/pom.xml + ${project.build.directory}/local-repo src/it/settings.xml ${jetty.stopKey} ${jetty.stopPort} - ${surefire.version} + ${maven.surefire.version} ${skipTests} diff --git a/jetty-maven-plugin/src/it/it-parent-pom/invoker.properties b/jetty-maven-plugin/src/it/it-parent-pom/invoker.properties new file mode 100644 index 00000000000..521301a6d91 --- /dev/null +++ b/jetty-maven-plugin/src/it/it-parent-pom/invoker.properties @@ -0,0 +1 @@ +invoker.goals = install \ No newline at end of file diff --git a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml new file mode 100644 index 00000000000..ffffdf384e7 --- /dev/null +++ b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml @@ -0,0 +1,146 @@ + + + 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + pom + + + @project.version@ + + + + + + commons-io + commons-io + 2.6 + + + javax.servlet + javax.servlet-api + @javax.servlet.api.version@ + provided + + + org.jboss.weld.servlet + weld-servlet + @weld.version@ + + + org.eclipse.jetty.toolchain + jetty-perf-helper + @jetty.perf-helper.version@ + + + com.fasterxml.jackson.core + jackson-databind + 2.8.1 + + + org.slf4j + slf4j-api + @slf4j.version@ + + + org.slf4j + slf4j-simple + @slf4j.version@ + + + org.eclipse.jetty + jetty-servlet + @project.version@ + + + org.eclipse.jetty + jetty-client + @project.version@ + + + org.eclipse.jetty + jetty-util + @project.version@ + + + org.eclipse.jetty + jetty-http + @project.version@ + + + org.eclipse.jetty + jetty-io + @project.version@ + + + org.eclipse.jetty + jetty-maven-plugin + @project.version@ + tests + test-jar + test + + + org.junit.jupiter + junit-jupiter-engine + @junit.version@ + test + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @maven.compiler.plugin.version@ + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-dependency-plugin + @maven.dependency.plugin.version@ + + + org.apache.maven.plugins + maven-failsafe-plugin + @maven.surefire.version@ + + + org.apache.maven.plugins + maven-resources-plugin + @maven.resources.plugin.version@ + + + org.apache.maven.plugins + maven-source-plugin + @maven.source.plugin.version@ + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + org.apache.maven.plugins + maven-surefire-plugin + @maven.surefire.version@ + + + org.apache.maven.plugins + maven-war-plugin + @maven.war.plugin.version@ + + + + + + \ No newline at end of file diff --git a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml index 0229f3cf8ca..9208f7ecd10 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml @@ -4,14 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-cdi-run-forked-mojo-it jetty-weld-minimal 1.0-SNAPSHOT war - @project.version@ - 2.4.5.Final ${project.build.directory}/jetty-cdi-run-forked-port.txt @@ -19,30 +23,25 @@ org.jboss.weld.servlet weld-servlet - ${weld.version} javax.servlet javax.servlet-api - 3.1.0 provided org.junit.jupiter junit-jupiter-engine - @junit.version@ test org.eclipse.jetty jetty-client - @project.version@ test org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test @@ -51,19 +50,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} @@ -77,7 +66,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ start-jetty diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml index dc5ecc8d157..528b0890f38 100644 --- a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-deploy-war-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -11,7 +17,6 @@ Jetty :: Simple deploy war mojo test - @project.version@ ${project.build.directory}/jetty-deploy-war-port.txt @@ -19,7 +24,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test @@ -27,26 +31,15 @@ org.junit.jupiter junit-jupiter-engine - @junit.version@ test - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - org.apache.maven.plugins maven-failsafe-plugin - @surefire.version@ ${jetty.port.file} @@ -77,7 +70,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ start-jetty @@ -107,7 +99,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.0.2 load-war @@ -147,7 +138,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ javax.xml.bind diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml index d2e2883e186..fdcc1c71400 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml @@ -22,27 +22,21 @@ jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml index 8f251f25620..168dd7e7b2e 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml @@ -35,7 +35,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test @@ -44,7 +43,6 @@ org.junit.jupiter junit-jupiter-engine - @junit.version@ test @@ -57,7 +55,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -68,7 +65,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml index 72f698ba84e..6ad8242c113 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-run-distro-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -14,7 +20,6 @@ UTF-8 UTF-8 1.8 - 3.0.0 @project.version@ @@ -30,55 +35,7 @@ jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml index 7cb2a2e00be..10adc6ec1c0 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml @@ -15,34 +15,27 @@ Jetty :: Simple :: Base - javax.servlet javax.servlet-api jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml index 6fe149d962c..c8af2120bd4 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -32,21 +32,17 @@ provided - org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test - org.junit.jupiter junit-jupiter-engine - @junit.version@ test @@ -59,7 +55,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -70,7 +65,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml index 03c697b9503..93e5bc38b15 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -25,61 +31,12 @@ - org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml index 94e3cf2b8ee..05c9b0335f0 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml @@ -15,36 +15,28 @@ Jetty :: Simple :: Base - javax.servlet javax.servlet-api jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml index 97aa7933c44..d8514ea74e5 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml @@ -38,18 +38,17 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test - + org.junit.jupiter junit-jupiter-engine - @junit.version@ test + @@ -59,7 +58,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -70,7 +68,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml index 575b7ef7431..1625960b537 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -14,7 +20,6 @@ UTF-8 UTF-8 1.8 - 3.0.0 @project.version@ @@ -25,67 +30,12 @@ - org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - org.slf4j - slf4j-simple - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml index 3ae1e093bb8..1fa6323df0f 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml @@ -15,36 +15,28 @@ Jetty :: Simple :: Base - javax.servlet javax.servlet-api jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 - diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml index 9ded127e8c2..0d75cad9095 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml @@ -19,35 +19,27 @@ - org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-base - org.eclipse.jetty jetty-servlet provided - - org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test - org.junit.jupiter junit-jupiter-engine - @junit.version@ test - @@ -57,7 +49,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -68,7 +59,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ true @@ -76,7 +66,6 @@ org.apache.maven.plugins maven-failsafe-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml index d68c9c3a11a..ad5a29cad54 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -14,7 +20,6 @@ UTF-8 UTF-8 1.8 - 3.0.0 @project.version@ @@ -25,61 +30,12 @@ - org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml index 8f0aab6e5ad..0269200449e 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml @@ -15,36 +15,27 @@ Jetty :: Simple :: Base - javax.servlet javax.servlet-api jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 - - diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml index 350e013c70b..6ab552d13e2 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml @@ -18,34 +18,26 @@ ${project.build.directory}/jetty-run-war-port.txt - - - org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-base - org.eclipse.jetty jetty-servlet provided - org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test - org.junit.jupiter junit-jupiter-engine - @junit.version@ test @@ -57,7 +49,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -68,7 +59,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ true @@ -76,7 +66,6 @@ org.apache.maven.plugins maven-failsafe-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml index 2a9e3d1acc2..96f0c6bc8ef 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -14,7 +20,6 @@ UTF-8 UTF-8 1.8 - 3.0.0 @project.version@ @@ -25,61 +30,12 @@ - org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml index a5e1cb9cea5..dbefb81281d 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml @@ -15,36 +15,27 @@ Jetty :: Simple :: Base - javax.servlet javax.servlet-api jar provided - org.slf4j slf4j-api - commons-io commons-io - org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 - com.fasterxml.jackson.core jackson-databind - 2.8.1 - - diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml index 8d7096ad978..feea2dbd628 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test @@ -43,7 +42,6 @@ org.junit.jupiter junit-jupiter-engine - @junit.version@ test @@ -56,7 +54,6 @@ org.apache.maven.plugins maven-war-plugin - ${maven-war-plugin-version} false @@ -67,7 +64,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml index e22078fc39d..bd5cb98a9b7 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -14,7 +20,6 @@ UTF-8 UTF-8 1.8 - 3.0.0 @project.version@ @@ -25,61 +30,12 @@ - org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-base ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.slf4j - slf4j-api - 1.7.21 - - - - commons-io - commons-io - 2.5 - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - - diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml index 2a394059626..eb5310f1eaa 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml @@ -34,37 +34,31 @@ org.eclipse.jetty jetty-client - ${jetty.version} test org.eclipse.jetty jetty-util - ${jetty.version} test org.eclipse.jetty jetty-http - ${jetty.version} test org.eclipse.jetty jetty-io - ${jetty.version} test org.junit.jupiter junit-jupiter-engine - @junit.version@ test org.eclipse.jetty jetty-maven-plugin - @project.version@ tests test-jar test @@ -76,7 +70,6 @@ org.apache.maven.plugins maven-surefire-plugin - @surefire.version@ ${jetty.port.file} diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-shared/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-shared/pom.xml index d9e985631b0..054ba242e95 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-shared/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-shared/pom.xml @@ -21,6 +21,7 @@ + org.apache.maven.plugins maven-source-plugin diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml index 798e5050a34..ee8e2e8247a 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml @@ -3,6 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.jetty.its + it-parent-pom + 0.0.1-SNAPSHOT + + org.olamy beer 1.0-SNAPSHOT @@ -22,11 +28,6 @@ pom import - - javax.servlet - javax.servlet-api - 3.1.0 - @@ -43,18 +44,9 @@ - - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - ${jetty.version} @@ -69,8 +61,8 @@ + org.apache.maven.plugins maven-source-plugin - 3.0.1 attach-sources diff --git a/pom.xml b/pom.xml index f9978366a1a..ef3fcf75261 100644 --- a/pom.xml +++ b/pom.xml @@ -31,12 +31,23 @@ benchmarks 1.2.0 1.1.5 - 2.22.0 5.3.0 - 3.5.2 3.5.0 + 3.1.0 + 2.4.5.Final + 1.0.5 + + 2.22.0 + 3.8.0 + 3.1.1 + 3.1.0 + 3.0.1 + 3.2.2 + 3.5.2 + + 5.0 @@ -262,6 +273,7 @@ + org.apache.maven.plugins maven-remote-resources-plugin @@ -279,6 +291,7 @@ + org.apache.maven.plugins maven-source-plugin true @@ -421,7 +434,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + ${maven.compiler.plugin.version} 1.8 1.8 @@ -430,7 +443,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + ${maven.dependency.plugin.version} org.apache.maven.plugins @@ -453,7 +466,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${surefire.version} + ${maven.surefire.version} org.junit.jupiter @@ -597,7 +610,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 + ${maven.resources.plugin.version} org.apache.maven.plugins @@ -619,12 +632,12 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + ${maven.source.plugin.version} org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} + ${maven.surefire.version} 3600 @{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails @@ -640,7 +653,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.2 + ${maven.war.plugin.version} org.eclipse.jetty.toolchain @@ -923,7 +936,7 @@ javax.servlet javax.servlet-api - 3.1.0 + ${javax.servlet.api.version} javax.websocket @@ -1014,12 +1027,12 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - ${maven-plugin-tools.version} + ${maven.plugin-tools.version} org.apache.maven.plugin-tools maven-plugin-annotations - ${maven-plugin-tools.version} + ${maven.plugin-tools.version} provided @@ -1031,7 +1044,7 @@ org.eclipse.jetty.toolchain jetty-perf-helper - 1.0.5 + ${jetty.perf-helper.version} org.slf4j