Fix build by actually committing the change in the plist...

2 files changed, 93 insertions, 69 deletions

diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index cb2b381f907d..2a3c9206ae2e 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
 DISTVERSION=		3.08_00
-#PORTREVISION=		1
+PORTREVISION=		1
 CATEGORIES=		security www java
 MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
 
diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist
index d0fa67e21243..6a25345c00ce 100644
--- a/security/bastillion/pkg-plist
+++ b/security/bastillion/pkg-plist
@@ -123,7 +123,7 @@ jetty_bastillion/bastillion/_res/inc/errors.html
 jetty_bastillion/bastillion/_res/inc/header.html
 jetty_bastillion/bastillion/_res/inc/navigation.html
 jetty_bastillion/bastillion/_res/js/bootstrap.js
-jetty_bastillion/bastillion/_res/js/jquery-3.3.1.js
+jetty_bastillion/bastillion/_res/js/jquery-3.4.1.js
 jetty_bastillion/bastillion/_res/js/jquery-ui.js
 jetty_bastillion/bastillion/_res/js/jquery.floatThead.js
 jetty_bastillion/bastillion/_res/js/tty/addons/fit/fit.js
@@ -160,74 +160,74 @@ jetty_bastillion/bastillion/manage/view_terms.html
 jetty_bastillion/bastillion/manage/view_users.html
 jetty_bastillion/bin/jetty.sh
 jetty_bastillion/lib/alpn-api-1.1.3.v20160715.jar
-jetty_bastillion/lib/annotations/asm-7.0.jar
-jetty_bastillion/lib/annotations/asm-analysis-7.0.jar
-jetty_bastillion/lib/annotations/asm-commons-7.0.jar
-jetty_bastillion/lib/annotations/asm-tree-7.0.jar
+jetty_bastillion/lib/annotations/asm-7.1.jar
+jetty_bastillion/lib/annotations/asm-analysis-7.1.jar
+jetty_bastillion/lib/annotations/asm-commons-7.1.jar
+jetty_bastillion/lib/annotations/asm-tree-7.1.jar
 jetty_bastillion/lib/annotations/javax.annotation-api-1.3.jar
-jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.14.0.jar
-jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.15.v20190215.jar
-jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.35.1.jar
-jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.35.1.jar
+jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.17.0.jar
+jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.20.v20190813.jar
+jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.40.jar
+jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.40.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar
-jetty_bastillion/lib/cdi-2-9.4.15.v20190215.jar
-jetty_bastillion/lib/cdi-core-9.4.15.v20190215.jar
-jetty_bastillion/lib/cdi-servlet-9.4.15.v20190215.jar
 jetty_bastillion/lib/ext/.donotdelete
-jetty_bastillion/lib/fcgi/fcgi-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/fcgi/fcgi-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-common-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-hpack-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-server-9.4.15.v20190215.jar
+jetty_bastillion/lib/fcgi/fcgi-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/fcgi/fcgi-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-hpack-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-embedded-query-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-remote-query-9.4.20.v20190813.jar
 jetty_bastillion/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
-jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-java-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-annotations-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-continuation-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-deploy-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-hazelcast-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-http-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-infinispan-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-io-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jaas-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jaspi-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jmx-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jndi-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-memcached-sessions-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-nosql-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-plus-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-proxy-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-quickstart-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-rewrite-9.4.15.v20190215.jar
+jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-java-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-annotations-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-cdi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-continuation-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-deploy-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-hazelcast-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-http-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-io-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jaas-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jaspi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jmx-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jndi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-memcached-sessions-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-nosql-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-plus-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-proxy-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-quickstart-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-rewrite-9.4.20.v20190813.jar
 jetty_bastillion/lib/jetty-schemas-3.1.jar
-jetty_bastillion/lib/jetty-security-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-servlet-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-servlets-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-unixsocket-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-util-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-webapp-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-xml-9.4.15.v20190215.jar
+jetty_bastillion/lib/jetty-security-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-servlet-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-servlets-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-unixsocket-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-util-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-webapp-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-xml-9.4.20.v20190813.jar
 jetty_bastillion/lib/mail/javax.mail.glassfish-1.4.1.v201005082020.jar
 jetty_bastillion/lib/servlet-api-3.1.jar
 jetty_bastillion/lib/setuid/jetty-setuid-java-1.0.3.jar
 jetty_bastillion/lib/setuid/libsetuid-linux.so
 jetty_bastillion/lib/setuid/libsetuid-osx.so
-jetty_bastillion/lib/spring/jetty-spring-9.4.15.v20190215.jar
+jetty_bastillion/lib/spring/jetty-spring-9.4.20.v20190813.jar
 jetty_bastillion/lib/transactions/javax.transaction-api-1.3.jar
-jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.15.v20190215.jar
+jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.20.v20190813.jar
 jetty_bastillion/lib/websocket/javax.websocket-api-1.0.jar
-jetty_bastillion/lib/websocket/websocket-api-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-common-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-servlet-9.4.15.v20190215.jar
+jetty_bastillion/lib/websocket/websocket-api-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-servlet-9.4.20.v20190813.jar
 jetty_bastillion/license-eplv10-aslv20.html
 jetty_bastillion/logs/.donotdelete
 jetty_bastillion/modules/.donotdelete
@@ -256,6 +256,10 @@ jetty_bastillion/modules/alpn-impl/alpn-1.8.0_192.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_20.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_201.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_202.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_211.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_212.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_221.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_222.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_25.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_31.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_40.mod
@@ -275,14 +279,17 @@ jetty_bastillion/modules/alpn-impl/alpn-10.mod
 jetty_bastillion/modules/alpn-impl/alpn-11.mod
 jetty_bastillion/modules/alpn-impl/alpn-12.mod
 jetty_bastillion/modules/alpn-impl/alpn-13.mod
+jetty_bastillion/modules/alpn-impl/alpn-14.mod
 jetty_bastillion/modules/alpn-impl/alpn-8.mod
 jetty_bastillion/modules/alpn-impl/alpn-9.mod
 jetty_bastillion/modules/alpn.mod
 jetty_bastillion/modules/annotations.mod
 jetty_bastillion/modules/apache-jsp.mod
 jetty_bastillion/modules/apache-jstl.mod
+jetty_bastillion/modules/bytebufferpool.mod
+jetty_bastillion/modules/cdi-decorate.mod
+jetty_bastillion/modules/cdi-spi.mod
 jetty_bastillion/modules/cdi.mod
-jetty_bastillion/modules/cdi1.mod
 jetty_bastillion/modules/cdi2.mod
 jetty_bastillion/modules/client.mod
 jetty_bastillion/modules/connectionlimit.mod
@@ -293,6 +300,7 @@ jetty_bastillion/modules/continuation.mod
 jetty_bastillion/modules/customrequestlog.mod
 jetty_bastillion/modules/debug.mod
 jetty_bastillion/modules/debuglog.mod
+jetty_bastillion/modules/decorate.mod
 jetty_bastillion/modules/deploy.mod
 jetty_bastillion/modules/deprecated.properties
 jetty_bastillion/modules/ext.mod
@@ -307,14 +315,18 @@ jetty_bastillion/modules/global-webapp-common.mod
 jetty_bastillion/modules/gzip.mod
 jetty_bastillion/modules/hawtio.mod
 jetty_bastillion/modules/hawtio/hawtio.xml
-jetty_bastillion/modules/hazelcast-embedded-sessions.mod
-jetty_bastillion/modules/hazelcast-remote-sessions.mod
 jetty_bastillion/modules/home-base-warning.mod
 jetty_bastillion/modules/http-forwarded.mod
 jetty_bastillion/modules/http.mod
 jetty_bastillion/modules/http2.mod
 jetty_bastillion/modules/http2c.mod
 jetty_bastillion/modules/https.mod
+jetty_bastillion/modules/inetaccess.mod
+jetty_bastillion/modules/inetaccess/jetty-inetaccess.xml
+jetty_bastillion/modules/infinispan-embedded-query.mod
+jetty_bastillion/modules/infinispan-embedded.mod
+jetty_bastillion/modules/infinispan-remote-query.mod
+jetty_bastillion/modules/infinispan-remote.mod
 jetty_bastillion/modules/ipaccess.mod
 jetty_bastillion/modules/jaas.mod
 jetty_bastillion/modules/jamon.mod
@@ -376,15 +388,21 @@ jetty_bastillion/modules/session-store-file.mod
 jetty_bastillion/modules/session-store-gcloud.mod
 jetty_bastillion/modules/session-store-hazelcast-embedded.mod
 jetty_bastillion/modules/session-store-hazelcast-remote.mod
-jetty_bastillion/modules/session-store-infinispan-embedded-910.mod
 jetty_bastillion/modules/session-store-infinispan-embedded.mod
-jetty_bastillion/modules/session-store-infinispan-embedded/infinispan-embedded.xml
-jetty_bastillion/modules/session-store-infinispan-remote-910.mod
 jetty_bastillion/modules/session-store-infinispan-remote.mod
-jetty_bastillion/modules/session-store-infinispan-remote/resources/hotrod-client.properties
 jetty_bastillion/modules/session-store-jdbc.mod
 jetty_bastillion/modules/session-store-mongo.mod
 jetty_bastillion/modules/sessions.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan.xml
+jetty_bastillion/modules/sessions/infinispan/infinispan-common.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
+jetty_bastillion/modules/sessions/infinispan/remote/other_proto_marshallers.xml
+jetty_bastillion/modules/sessions/infinispan/remote/resources/hotrod-client.properties
 jetty_bastillion/modules/sessions/jdbc/datasource.mod
 jetty_bastillion/modules/sessions/jdbc/driver.mod
 jetty_bastillion/modules/sessions/mongo/address.mod
@@ -426,8 +444,9 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/webapps/README.TXT
 %%WWWDIR%%/webapps/bastillion.xml
 %%WWWDIR%%/etc/README.spnego
-%%WWWDIR%%/etc/cdi2/jetty-cdi2.xml
-%%WWWDIR%%/etc/cdi2/jetty-web-cdi2.xml
+%%WWWDIR%%/etc/cdi/jetty-cdi.xml
+%%WWWDIR%%/etc/cdi/jetty-cdi2.xml
+%%WWWDIR%%/etc/cdi/jetty-web-cdi2.xml
 %%WWWDIR%%/etc/console-capture.xml
 %%WWWDIR%%/etc/example-quickstart.xml
 %%WWWDIR%%/etc/home-base-warning.xml
@@ -435,11 +454,12 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/jetty-acceptratelimit.xml
 %%WWWDIR%%/etc/jetty-alpn.xml
 %%WWWDIR%%/etc/jetty-annotations.xml
-%%WWWDIR%%/etc/jetty-cdi.xml
+%%WWWDIR%%/etc/jetty-bytebufferpool.xml
 %%WWWDIR%%/etc/jetty-connectionlimit.xml
 %%WWWDIR%%/etc/jetty-customrequestlog.xml
 %%WWWDIR%%/etc/jetty-debug.xml
 %%WWWDIR%%/etc/jetty-debuglog.xml
+%%WWWDIR%%/etc/jetty-decorate.xml
 %%WWWDIR%%/etc/jetty-deploy.xml
 %%WWWDIR%%/etc/jetty-gzip.xml
 %%WWWDIR%%/etc/jetty-http-forwarded.xml
@@ -474,6 +494,7 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/jetty-unixsocket-proxy-protocol.xml
 %%WWWDIR%%/etc/jetty-unixsocket-secure.xml
 %%WWWDIR%%/etc/jetty-unixsocket.xml
+%%WWWDIR%%/etc/jetty-web-decorate.xml
 %%WWWDIR%%/etc/jetty-webapp.xml
 %%WWWDIR%%/etc/jetty.conf
 %%WWWDIR%%/etc/jetty.xml
@@ -485,8 +506,11 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/sessions/hazelcast/default.xml
 %%WWWDIR%%/etc/sessions/hazelcast/remote.xml
 %%WWWDIR%%/etc/sessions/id-manager.xml
-%%WWWDIR%%/etc/sessions/infinispan/default.xml
-%%WWWDIR%%/etc/sessions/infinispan/remote.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-common.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-embedded-query.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-embedded.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-remote-query.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-remote.xml
 %%WWWDIR%%/etc/sessions/jdbc/datasource.xml
 %%WWWDIR%%/etc/sessions/jdbc/driver.xml
 %%WWWDIR%%/etc/sessions/jdbc/session-store.xml