From 9190cac4069375fdc374c60651aa29763f4711e4 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 3 Dec 2014 10:46:39 -0700 Subject: [PATCH 1/2] Fixing broken build --- .../java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java | 1 - .../org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java index 4df357452f2..87d7c179abf 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java @@ -15,7 +15,6 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // -/* Some portions of this code are Copyright (c) 2014, Yahoo! Inc. All rights reserved. */ package org.eclipse.jetty.rewrite.handler; diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java index 368b561ec01..f6f9fa70cb1 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java @@ -15,7 +15,7 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // -/* Some portions of this code are Copyright (c) 2014, Yahoo! Inc. All rights reserved. */ + package org.eclipse.jetty.rewrite.handler; import org.junit.Before; From 46ebe86e28e52baf76a91a34f8974de0a7614c76 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 3 Dec 2014 10:50:45 -0700 Subject: [PATCH 2/2] Fixing broken build (due to license header format) --- .../rewrite/handler/HeaderRegexRuleTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java index f6f9fa70cb1..0edfde24c2c 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java @@ -1,19 +1,19 @@ // -// ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. // -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html // -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php // -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== // package org.eclipse.jetty.rewrite.handler;