Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

2019-01-22 12:42:55 +11:00 · 2019-01-22 12:42:55 +11:00 · c2224e3118
parent 2f6d0b3fb7 60158edd2b
commit c2224e3118
5 changed files with 1 additions and 23 deletions
--- 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)
    {
--- a/jetty-osgi/jetty-osgi-boot-jsp/build.properties
+++ b/jetty-osgi/jetty-osgi-boot-jsp/build.properties
@ -1,5 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
-src.includes = META-INF/
--- a/jetty-osgi/jetty-osgi-boot-warurl/build.properties
+++ b/jetty-osgi/jetty-osgi-boot-warurl/build.properties
@ -1,5 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
-src.includes = META-INF/
--- a/jetty-osgi/jetty-osgi-boot/build.properties
+++ b/jetty-osgi/jetty-osgi-boot/build.properties
@ -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/
--- a/jetty-osgi/jetty-osgi-httpservice/build.properties
+++ b/jetty-osgi/jetty-osgi-httpservice/build.properties
@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .