From b286497d0a4c08b2618013662b692c55424ae519 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 24 Sep 2021 11:59:30 +1000 Subject: [PATCH] Issue #3514 backport of mod files filtering (#6897) * Issue #3514 backport of mod files filtering Signed-off-by: Olivier Lamy * ignore keystore file Signed-off-by: Olivier Lamy * fix directory name Signed-off-by: Olivier Lamy * fix directory name Signed-off-by: Olivier Lamy * fix inclusion of keystore file Signed-off-by: Olivier Lamy --- .../jetty-gcloud-session-manager/pom.xml | 19 +-- .../src/main/assembly/config.xml | 4 +- .../session-store-hazelcast-embedded.mod | 2 +- .../session-store-hazelcast-remote.mod | 2 +- jetty-home/pom.xml | 6 + .../src/main/resources/modules/conscrypt.mod | 2 +- .../src/main/resources/modules/hawtio.mod | 5 +- .../src/main/resources/modules/jamon.mod | 7 +- .../src/main/resources/modules/jolokia.mod | 5 +- .../sessions/infinispan/infinispan-common.mod | 2 +- .../infinispan-embedded-query/pom.xml | 19 +-- .../src/main/assembly/config.xml | 4 +- jetty-infinispan/infinispan-embedded/pom.xml | 19 +-- .../src/main/assembly/config.xml | 4 +- .../infinispan/infinispan-embedded.xml | 0 .../modules/infinispan-embedded.mod | 0 .../session-store-infinispan-embedded.mod | 2 +- .../embedded/infinispan-embedded-libs.mod | 0 .../infinispan-embedded-serverclasses.mod | 0 .../infinispan/embedded/infinispan.xml | 0 .../infinispan-remote-query/pom.xml | 19 +-- .../src/main/assembly/config.xml | 4 +- jetty-infinispan/infinispan-remote/pom.xml | 20 +-- .../src/main/assembly/config.xml | 4 +- .../session-store-infinispan-remote.mod | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- .../session-data-cache/xmemcached.mod | 5 +- jetty-nosql/pom.xml | 2 +- .../config/modules/session-store-mongo.mod | 3 +- jetty-server/pom.xml | 25 ++++ jetty-unixsocket/pom.xml | 21 +-- jetty-unixsocket/src/main/assembly/config.xml | 4 +- .../src/main/config/modules/log4j-impl.mod | 2 +- .../src/main/config/modules/logback-impl.mod | 2 +- .../src/main/config/modules/slf4j-api.mod | 2 +- pom.xml | 132 +++++++++++++++++- 36 files changed, 211 insertions(+), 140 deletions(-) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/etc/sessions/infinispan/infinispan-embedded.xml (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/infinispan-embedded.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/session-store-infinispan-embedded.mod (91%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan.xml (100%) diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 42f13524db47..298b7188f3ef 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -128,7 +128,7 @@ - + @@ -136,23 +136,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml index 29e5be1228af..d621ddfd7674 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-template + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules gcloud-datastore.mod diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod index 57d4f02a1a5d..dc58f83f4e86 100644 --- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod +++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod @@ -23,7 +23,7 @@ lib/jetty-hazelcast-${jetty.version}.jar lib/hazelcast/hazelcast-${hazelcast.version}.jar [ini] -hazelcast.version?=3.12.12 +hazelcast.version?=@hazelcast.version@ [license] Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license. diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod index f4d152834b8d..c6a4d9b736e2 100644 --- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod +++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod @@ -25,7 +25,7 @@ lib/hazelcast/hazelcast-${hazelcast.version}.jar lib/hazelcast/hazelcast-client-${hazelcast.version}.jar [ini] -hazelcast.version?=3.12.12 +hazelcast.version?=@hazelcast.version@ jetty.webapp.addSystemClasses+=,org.eclipse.jetty.hazelcast. jetty.webapp.addServerClasses+=,-org.eclipse.jetty.hazelcast. diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index f6857114a5b8..79a9dfcbcd2a 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -33,9 +33,15 @@ false true ${assembly-directory} + UTF-8 + false + + @ + ${basedir}/src/main/resources + true diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod index 2e1e7f50f1a0..d987cfb8d138 100644 --- a/jetty-home/src/main/resources/modules/conscrypt.mod +++ b/jetty-home/src/main/resources/modules/conscrypt.mod @@ -29,6 +29,6 @@ Conscrypt is distributed under the Apache Licence 2.0 https://github.com/google/conscrypt/blob/master/LICENSE [ini] -conscrypt.version?=2.0.0 +conscrypt.version?=@conscrypt.version@ jetty.sslContext.provider?=Conscrypt diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod index ddc3ad43a70e..4d91c1cc8646 100644 --- a/jetty-home/src/main/resources/modules/hawtio.mod +++ b/jetty-home/src/main/resources/modules/hawtio.mod @@ -17,9 +17,12 @@ etc/hawtio.xml [files] etc/hawtio/ lib/hawtio/ -maven://io.hawt/hawtio-default/1.4.16|lib/hawtio/hawtio.war +maven://io.hawt/hawtio-default/${hawtio.version}|lib/hawtio/hawtio.war basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml +[ini] +hawtio.version?=@hawtio.version@ + [license] Hawtio is a redhat JBoss project released under the Apache License, v2.0 http://hawt.io/ diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod index 21bac47de96a..e1da835cc685 100644 --- a/jetty-home/src/main/resources/modules/jamon.mod +++ b/jetty-home/src/main/resources/modules/jamon.mod @@ -17,8 +17,8 @@ etc/jamon.xml [files] lib/jamon/ -maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar -maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war +maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar +maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war basehome:modules/jamon/jamon.xml|etc/jamon.xml [lib] @@ -29,6 +29,9 @@ JAMon is a source forge hosted project released under a BSD derived license. http://jamonapi.sourceforge.net http://jamonapi.sourceforge.net/JAMonLicense.html +[ini] +jamon.version?=@jamon.version@ + [ini-template] ## Jamon Configuration # jamon.summaryLabels=demo diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod index 975d709c25c5..ee4875d5d241 100644 --- a/jetty-home/src/main/resources/modules/jolokia.mod +++ b/jetty-home/src/main/resources/modules/jolokia.mod @@ -15,9 +15,12 @@ jmx etc/jolokia.xml [files] -maven://org.jolokia/jolokia-war/1.2.2/war|lib/jolokia/jolokia.war +maven://org.jolokia/jolokia-war/${jolokia.version}/war|lib/jolokia/jolokia.war basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml +[ini] +jolokia.version?=@jolokia.version@ + [license] Jolokia is released under the Apache License 2.0 http://www.jolokia.org diff --git a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod b/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod index 3c588cc1b5c6..d1caf93b0619 100644 --- a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod +++ b/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod @@ -12,7 +12,7 @@ lib/infinispan-common-${jetty.version}.jar lib/infinispan/*.jar [ini] -infinispan.version?=9.4.8.Final +infinispan.version?=@infinispan.version@ [license] Infinispan is an open source project hosted on Github and released under the Apache 2.0 license. diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index d00add572031..202b4321ee00 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -60,7 +60,7 @@ - + @@ -68,23 +68,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml index d9db9a74ef21..f0f8436781ad 100644 --- a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-template + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/embedded infinispan-embedded-query-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 6a75b3ca564a..ca81d1c0ebe5 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -61,7 +61,7 @@ - + @@ -70,23 +70,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml index 491f84e61161..93917acb50e5 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-templates + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/embedded infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod similarity index 91% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod index 1d2e9da7b876..bff64cdba501 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod +++ b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod @@ -16,7 +16,7 @@ sessions/infinispan/embedded/infinispan-embedded-libs basehome:modules/sessions/infinispan/embedded/infinispan.xml|etc/infinispan.xml [ini] -infinispan.version?=9.4.8.Final +infinispan.version?=@infinispan.version@ [ini-template] #jetty.session.infinispan.idleTimeout.seconds=0 diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 08930cb169c3..a5a1615a43b3 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -61,7 +61,7 @@ - + @@ -69,23 +69,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml index 270dcfad3825..74d1280ed3da 100644 --- a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-template + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/remote infinispan-remote-query-libs.mod diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index ec4bcdb27248..6a6433f5e18e 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -62,7 +62,7 @@ - + @@ -70,24 +70,6 @@ - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml index 802f815d6aa5..f8c265477fb8 100644 --- a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-template + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/remote infinispan-remote-libs.mod diff --git a/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod b/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod index 95e033d10c65..dc1a043119e9 100644 --- a/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod +++ b/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod @@ -16,7 +16,7 @@ sessions/infinispan/remote/infinispan-remote-libs basehome:modules/sessions/infinispan/remote/resources/hotrod-client.properties|resources/hotrod-client.properties [ini] -infinispan.version?=9.4.8.Final +infinispan.version?=@infinispan.version@ [license] diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 1c24d8fc659f..a4d2a9c35018 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -19,7 +19,7 @@ com.googlecode.xmemcached xmemcached - 2.4.7 + ${xmemcached.version} org.slf4j diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod index 515f95272041..53edec170177 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod +++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod @@ -11,7 +11,10 @@ session-store slf4j-api [files] -maven://com.googlecode.xmemcached/xmemcached/2.4.5|lib/xmemcached/xmemcached-2.4.5.jar +maven://com.googlecode.xmemcached/xmemcached/${xmemcached.version}|lib/xmemcached/xmemcached-${xmemcached.version}.jar + +[ini] +xmemcached.version?=@xmemcached.version@ [lib] lib/jetty-memcached-sessions-${jetty.version}.jar diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index f0e23eeb2915..22341a475631 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -34,7 +34,7 @@ org.mongodb mongo-java-driver - 2.13.2 + ${mongodb.version} jar compile diff --git a/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-nosql/src/main/config/modules/session-store-mongo.mod index 9999bc7785b9..89150dd08b0a 100644 --- a/jetty-nosql/src/main/config/modules/session-store-mongo.mod +++ b/jetty-nosql/src/main/config/modules/session-store-mongo.mod @@ -14,7 +14,7 @@ sessions sessions/mongo/${connection-type} [files] -maven://org.mongodb/mongo-java-driver/2.13.2|lib/nosql/mongo-java-driver-2.13.2.jar +maven://org.mongodb/mongo-java-driver/${mongodb.version}|lib/nosql/mongo-java-driver-${mongodb.version}.jar [lib] lib/jetty-nosql-${jetty.version}.jar @@ -28,6 +28,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html [ini] connection-type?=address +mongodb.version?=@mongodb.version@ [ini-template] #jetty.session.mongo.dbName=HttpSessions diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 848793d9f21b..088fe4ae87ea 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -26,6 +26,31 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources-keystore + process-resources + + copy-resources + + + UTF-8 + ${project.build.directory}/jetty-config-files + + + src/main/config + + **/**keystore** + + + + + + + diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 7a2b0f62bb55..50a3fc6af1de 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -82,32 +82,15 @@ - + - + - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-unixsocket/src/main/assembly/config.xml b/jetty-unixsocket/src/main/assembly/config.xml index 3c97242ba281..f4dd8865b05b 100644 --- a/jetty-unixsocket/src/main/assembly/config.xml +++ b/jetty-unixsocket/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-template + ${project.build.directory}/jetty-config-files ** @@ -18,7 +18,7 @@ - target + ${project.build.directory} modules unixsocket.mod diff --git a/jetty-util/src/main/config/modules/log4j-impl.mod b/jetty-util/src/main/config/modules/log4j-impl.mod index d5fa92e502de..bfe9bcb54405 100644 --- a/jetty-util/src/main/config/modules/log4j-impl.mod +++ b/jetty-util/src/main/config/modules/log4j-impl.mod @@ -28,5 +28,5 @@ Log4j is released under the Apache 2.0 license. http://www.apache.org/licenses/LICENSE-2.0.html [ini] -log4j.version?=1.2.17 +log4j.version?=@log4j.version@ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/log4j/ diff --git a/jetty-util/src/main/config/modules/logback-impl.mod b/jetty-util/src/main/config/modules/logback-impl.mod index f9fb173f2f5f..05b6df0f2b49 100644 --- a/jetty-util/src/main/config/modules/logback-impl.mod +++ b/jetty-util/src/main/config/modules/logback-impl.mod @@ -36,5 +36,5 @@ or (per the licensee's choosing) under http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html [ini] -logback.version?=1.2.3 +logback.version?=@logback.version@ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/logback/ diff --git a/jetty-util/src/main/config/modules/slf4j-api.mod b/jetty-util/src/main/config/modules/slf4j-api.mod index 0df154aa75dd..b7146c345ac8 100644 --- a/jetty-util/src/main/config/modules/slf4j-api.mod +++ b/jetty-util/src/main/config/modules/slf4j-api.mod @@ -16,7 +16,7 @@ maven://org.slf4j/slf4j-api/${slf4j.version}|lib/slf4j/slf4j-api-${slf4j.version lib/slf4j/slf4j-api-${slf4j.version}.jar [ini] -slf4j.version?=1.7.30 +slf4j.version?=@slf4j.version@ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/ [license] diff --git a/pom.xml b/pom.xml index ad11604c6633..3fbea06909eb 100644 --- a/pom.xml +++ b/pom.xml @@ -37,9 +37,11 @@ 2.8.8 30.1.1-jre 5.0.1 + 2.13.5 3.12.12 9.4.8.Final 4.3.4.Final + 2.81 1.1.0.v201105071233 1.3.2 1.4.1.v201005082020 @@ -57,6 +59,7 @@ 2.2.7 3.1.10 0.38.11 + 1.3.3 8.5.70 5.8.1 2.14.0 @@ -64,6 +67,7 @@ 3.8.2 3.6.1 1.7.2 + 2.13.2 8.0.0 6.0.0 2.1.0 @@ -72,6 +76,7 @@ 1.2.5 1.2.5 3.1.5.Final + 2.4.7 2.2.1 @@ -508,7 +513,7 @@ org.eclipse.jetty.toolchain jetty-assembly-descriptors - 1.0 + 1.1 @@ -1102,6 +1107,42 @@ ant-launcher ${ant.version} + + + io.hawt + hawtio-default + ${hawtio.version} + war + + + com.jamonapi + jamon + ${jamon.version} + + + javax.servlet + servlet-api + + + + + com.jamonapi + jamon_war + ${jamon.version} + war + + + javax.servlet + servlet-api + + + + + org.jolokia + jolokia-war + ${jolokia.version} + war + @@ -1204,6 +1245,36 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + process-resources + + copy-resources + + + UTF-8 + false + + @ + + ${project.build.directory}/jetty-config-files + + + src/main/config + true + + **/*keystore + + + + + + + org.apache.maven.plugins maven-assembly-plugin @@ -1224,6 +1295,65 @@ + + config-template + + + src/main/config-template + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + process-resources + + copy-resources + + + UTF-8 + false + + @ + + ${project.build.directory}/jetty-config-files + + + src/main/config-template + true + + **/*.p12 + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + src/main/assembly/config.xml + + + + + + + + eclipse-release