Hello Claus! This commit broke our feature file. I fixed it with commit r1393744. Could you please have a look at it (parent/pom.xml). I had to set "org.eclipse.jetty.util.ssl" as optional import, because it doesn't exist in Jetty 7.5.x.
Best, Christian On Tue, Sep 18, 2012 at 8:27 AM, <davscl...@apache.org> wrote: > Author: davsclaus > Date: Tue Sep 18 06:27:12 2012 > New Revision: 1386999 > > URL: http://svn.apache.org/viewvc?rev=1386999&view=rev > Log: > CAMEL-5594: Upgraded to Jetty 7.6.7 > > Modified: > > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java > > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java > > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java > camel/trunk/parent/pom.xml > > Modified: > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff > > ============================================================================== > --- > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java > (original) > +++ > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java > Tue Sep 18 06:27:12 2012 > @@ -28,12 +28,12 @@ import org.apache.camel.RuntimeCamelExce > import org.apache.camel.builder.RouteBuilder; > import org.apache.camel.component.http.HttpOperationFailedException; > import org.apache.camel.impl.JndiRegistry; > -import org.eclipse.jetty.http.security.Constraint; > import org.eclipse.jetty.security.ConstraintMapping; > import org.eclipse.jetty.security.ConstraintSecurityHandler; > import org.eclipse.jetty.security.HashLoginService; > import org.eclipse.jetty.security.SecurityHandler; > import org.eclipse.jetty.security.authentication.BasicAuthenticator; > +import org.eclipse.jetty.util.security.Constraint; > import org.junit.Test; > > /** > > Modified: > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff > > ============================================================================== > --- > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java > (original) > +++ > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java > Tue Sep 18 06:27:12 2012 > @@ -28,12 +28,12 @@ import org.apache.camel.component.http.A > import org.apache.camel.component.http.HttpComponent; > import org.apache.camel.component.http.HttpConfiguration; > import org.apache.camel.impl.JndiRegistry; > -import org.eclipse.jetty.http.security.Constraint; > import org.eclipse.jetty.security.ConstraintMapping; > import org.eclipse.jetty.security.ConstraintSecurityHandler; > import org.eclipse.jetty.security.HashLoginService; > import org.eclipse.jetty.security.SecurityHandler; > import org.eclipse.jetty.security.authentication.BasicAuthenticator; > +import org.eclipse.jetty.util.security.Constraint; > import org.junit.Test; > > /** > > Modified: > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java?rev=1386999&r1=1386998&r2=1386999&view=diff > > ============================================================================== > --- > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java > (original) > +++ > camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java > Tue Sep 18 06:27:12 2012 > @@ -28,12 +28,12 @@ import org.apache.camel.RuntimeCamelExce > import org.apache.camel.builder.RouteBuilder; > import org.apache.camel.component.http.HttpOperationFailedException; > import org.apache.camel.impl.JndiRegistry; > -import org.eclipse.jetty.http.security.Constraint; > import org.eclipse.jetty.security.ConstraintMapping; > import org.eclipse.jetty.security.ConstraintSecurityHandler; > import org.eclipse.jetty.security.HashLoginService; > import org.eclipse.jetty.security.SecurityHandler; > import org.eclipse.jetty.security.authentication.BasicAuthenticator; > +import org.eclipse.jetty.util.security.Constraint; > import org.junit.Test; > > /** > > Modified: camel/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1386999&r1=1386998&r2=1386999&view=diff > > ============================================================================== > --- camel/trunk/parent/pom.xml (original) > +++ camel/trunk/parent/pom.xml Tue Sep 18 06:27:12 2012 > @@ -168,7 +168,7 @@ > <jclouds-feature-version>1.4.0</jclouds-feature-version> > <jdom-bundle-version>1.1_4</jdom-bundle-version> > <jdom-version>1.1.3</jdom-version> > - <jetty-version>7.5.4.v20111024</jetty-version> > + <jetty-version>7.6.7.v20120910</jetty-version> > <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> > <jettison-version>1.3.2</jettison-version> > <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version> > @@ -324,7 +324,7 @@ > org.apache.commons.httpclient.*;version="[3.1,4.0)", > org.apache.velocity.*;version="[1.6.2,2)", > org.apache.xmlbeans.*;version="[2.4,3)", > - org.eclipse.jetty.*;version="[7.4,8.2)", > + org.eclipse.jetty.*;version="[7.5,8.2)", > com.thoughtworks.xstream.*;version="[1.3,2)", > org.antlr.stringtemplate.*;version="[3.0,4)", > org.jivesoftware.smack.*;version="[3.0,4)", > > > --
