From 1df8dfcc9149cd67b104646bfc4fc8b1939a7993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ortwin=20Gl=C3=BCck?= <odi@odi.ch>
Date: Fri, 18 Jan 2019 14:27:31 +0100
Subject: [PATCH 1/2] make JAASPrincipal thread-safe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's immutable anyway, so declare its only instance var final.

Signed-off-by: Ortwin Glück <odi@odi.ch>
---
 .../src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
index 027c239b498..0566764292b 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
@@ -30,7 +30,7 @@ public class JAASPrincipal implements Principal, Serializable
 {
     private static final long serialVersionUID = -5538962177019315479L;
     
-    private String _name = null;
+    private final String _name;
     
     public JAASPrincipal(String userName)
     {

From 60158edd2bd57e15e6cdad421f5f2dc74043a9fb Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Tue, 22 Jan 2019 12:41:28 +1100
Subject: [PATCH 2/2] Issue #3280 Remove unused build.properties from osgi
 (#3281)

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 jetty-osgi/jetty-osgi-boot-jsp/build.properties    | 5 -----
 jetty-osgi/jetty-osgi-boot-warurl/build.properties | 5 -----
 jetty-osgi/jetty-osgi-boot/build.properties        | 8 --------
 jetty-osgi/jetty-osgi-httpservice/build.properties | 4 ----
 4 files changed, 22 deletions(-)
 delete mode 100644 jetty-osgi/jetty-osgi-boot-jsp/build.properties
 delete mode 100644 jetty-osgi/jetty-osgi-boot-warurl/build.properties
 delete mode 100644 jetty-osgi/jetty-osgi-boot/build.properties
 delete mode 100644 jetty-osgi/jetty-osgi-httpservice/build.properties

diff --git a/jetty-osgi/jetty-osgi-boot-jsp/build.properties b/jetty-osgi/jetty-osgi-boot-jsp/build.properties
deleted file mode 100644
index 6d10c98886e..00000000000
--- a/jetty-osgi/jetty-osgi-boot-jsp/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
-src.includes = META-INF/
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/build.properties b/jetty-osgi/jetty-osgi-boot-warurl/build.properties
deleted file mode 100644
index 6d10c98886e..00000000000
--- a/jetty-osgi/jetty-osgi-boot-warurl/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
-src.includes = META-INF/
diff --git a/jetty-osgi/jetty-osgi-boot/build.properties b/jetty-osgi/jetty-osgi-boot/build.properties
deleted file mode 100644
index ba1366d0903..00000000000
--- a/jetty-osgi/jetty-osgi-boot/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               jettyhome/
-bin.excludes = jettyhome/logs/*.log,\
-               jettyhome/lib/*
-src.includes = jettyhome/
diff --git a/jetty-osgi/jetty-osgi-httpservice/build.properties b/jetty-osgi/jetty-osgi-httpservice/build.properties
deleted file mode 100644
index 5fc538bc83f..00000000000
--- a/jetty-osgi/jetty-osgi-httpservice/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .