Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3514 backport of mod files filtering (#6897) 

* Issue #3514 backport of mod files filtering

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* ignore keystore file

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix directory name

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix directory name

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix inclusion of keystore file

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2021-09-24 11:59:30 +10:00 committed by GitHub
parent 9b47247f0e
commit b286497d0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 211 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View File

@ -128,7 +128,7 @@
<configuration> <configuration>
<target> <target>
<concat destfile="${project.build.directory}/gcloud-datastore.mod"> <concat destfile="${project.build.directory}/gcloud-datastore.mod">
<fileset file="src/main/config-template/modules/gcloud-datastore.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/gcloud-datastore.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</target> </target>
@ -136,23 +136,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

4
jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-template</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -17,7 +17,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules</outputDirectory> <outputDirectory>modules</outputDirectory>
<includes> <includes>
<include>gcloud-datastore.mod</include> <include>gcloud-datastore.mod</include>

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
View File

@ -23,7 +23,7 @@ lib/jetty-hazelcast-${jetty.version}.jar
lib/hazelcast/hazelcast-${hazelcast.version}.jar lib/hazelcast/hazelcast-${hazelcast.version}.jar
[ini] [ini]
hazelcast.version?=3.12.12 hazelcast.version?=@hazelcast.version@
[license] [license]
Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license. Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
View File

@ -25,7 +25,7 @@ lib/hazelcast/hazelcast-${hazelcast.version}.jar
lib/hazelcast/hazelcast-client-${hazelcast.version}.jar lib/hazelcast/hazelcast-client-${hazelcast.version}.jar
[ini] [ini]
hazelcast.version?=3.12.12 hazelcast.version?=@hazelcast.version@
jetty.webapp.addSystemClasses+=,org.eclipse.jetty.hazelcast. jetty.webapp.addSystemClasses+=,org.eclipse.jetty.hazelcast.
jetty.webapp.addServerClasses+=,-org.eclipse.jetty.hazelcast. jetty.webapp.addServerClasses+=,-org.eclipse.jetty.hazelcast.

6
jetty-home/pom.xml
View File

@ -33,9 +33,15 @@
<useBuildFilters>false</useBuildFilters> <useBuildFilters>false</useBuildFilters>
<includeEmptyDirs>true</includeEmptyDirs> <includeEmptyDirs>true</includeEmptyDirs>
<outputDirectory>${assembly-directory}</outputDirectory> <outputDirectory>${assembly-directory}</outputDirectory>
<encoding>UTF-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
<resources> <resources>
<resource> <resource>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>

2
jetty-home/src/main/resources/modules/conscrypt.mod
View File

@ -29,6 +29,6 @@ Conscrypt is distributed under the Apache Licence 2.0
https://github.com/google/conscrypt/blob/master/LICENSE https://github.com/google/conscrypt/blob/master/LICENSE
[ini] [ini]
conscrypt.version?=2.0.0 conscrypt.version?=@conscrypt.version@
jetty.sslContext.provider?=Conscrypt jetty.sslContext.provider?=Conscrypt

5
jetty-home/src/main/resources/modules/hawtio.mod
View File

@ -17,9 +17,12 @@ etc/hawtio.xml
[files] [files]
etc/hawtio/ etc/hawtio/
lib/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 basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml
[ini]
hawtio.version?=@hawtio.version@
[license] [license]
Hawtio is a redhat JBoss project released under the Apache License, v2.0 Hawtio is a redhat JBoss project released under the Apache License, v2.0
http://hawt.io/ http://hawt.io/

7
jetty-home/src/main/resources/modules/jamon.mod
View File

@ -17,8 +17,8 @@ etc/jamon.xml
[files] [files]
lib/jamon/ lib/jamon/
maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar
maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war
basehome:modules/jamon/jamon.xml|etc/jamon.xml basehome:modules/jamon/jamon.xml|etc/jamon.xml
[lib] [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
http://jamonapi.sourceforge.net/JAMonLicense.html http://jamonapi.sourceforge.net/JAMonLicense.html
[ini]
jamon.version?=@jamon.version@
[ini-template] [ini-template]
## Jamon Configuration ## Jamon Configuration
# jamon.summaryLabels=demo # jamon.summaryLabels=demo

5
jetty-home/src/main/resources/modules/jolokia.mod
View File

@ -15,9 +15,12 @@ jmx
etc/jolokia.xml etc/jolokia.xml
[files] [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 basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml
[ini]
jolokia.version?=@jolokia.version@
[license] [license]
Jolokia is released under the Apache License 2.0 Jolokia is released under the Apache License 2.0
http://www.jolokia.org http://www.jolokia.org

2
jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
View File

@ -12,7 +12,7 @@ lib/infinispan-common-${jetty.version}.jar
lib/infinispan/*.jar lib/infinispan/*.jar
[ini] [ini]
infinispan.version?=9.4.8.Final infinispan.version?=@infinispan.version@
[license] [license]
Infinispan is an open source project hosted on Github and released under the Apache 2.0 license. Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.

19
jetty-infinispan/infinispan-embedded-query/pom.xml
View File

@ -60,7 +60,7 @@
<configuration> <configuration>
<target> <target>
<concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod"> <concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</target> </target>
@ -68,23 +68,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>

4
jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-template</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -17,7 +17,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/embedded</outputDirectory> <outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
<includes> <includes>
<include>infinispan-embedded-query-libs.mod</include> <include>infinispan-embedded-query-libs.mod</include>

19
jetty-infinispan/infinispan-embedded/pom.xml
View File

@ -61,7 +61,7 @@
<configuration> <configuration>
<target> <target>
<concat destfile="${project.build.directory}/infinispan-embedded-libs.mod"> <concat destfile="${project.build.directory}/infinispan-embedded-libs.mod">
<fileset file="src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</target> </target>
@ -70,23 +70,6 @@
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>

4
jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-templates</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -17,7 +17,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/embedded</outputDirectory> <outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
<includes> <includes>
<include>infinispan-embedded-libs.mod</include> <include>infinispan-embedded-libs.mod</include>

0
jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml → jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
View File

0
jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod → jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
View File

2
jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod → jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
View File

@ -16,7 +16,7 @@ sessions/infinispan/embedded/infinispan-embedded-libs
basehome:modules/sessions/infinispan/embedded/infinispan.xml|etc/infinispan.xml basehome:modules/sessions/infinispan/embedded/infinispan.xml|etc/infinispan.xml
[ini] [ini]
infinispan.version?=9.4.8.Final infinispan.version?=@infinispan.version@
[ini-template] [ini-template]
#jetty.session.infinispan.idleTimeout.seconds=0 #jetty.session.infinispan.idleTimeout.seconds=0

0
jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod → jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
View File

0
jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod → jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
View File

0
jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml → jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
View File

19
jetty-infinispan/infinispan-remote-query/pom.xml
View File

@ -61,7 +61,7 @@
<configuration> <configuration>
<target> <target>
<concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod"> <concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</target> </target>
@ -69,23 +69,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

4
jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-template</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -17,7 +17,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/remote</outputDirectory> <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
<includes> <includes>
<include>infinispan-remote-query-libs.mod</include> <include>infinispan-remote-query-libs.mod</include>

20
jetty-infinispan/infinispan-remote/pom.xml
View File

@ -62,7 +62,7 @@
<configuration> <configuration>
<target> <target>
<concat destfile="${project.build.directory}/infinispan-remote-libs.mod"> <concat destfile="${project.build.directory}/infinispan-remote-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</target> </target>
@ -70,24 +70,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>

4
jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-template</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -17,7 +17,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/remote</outputDirectory> <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
<includes> <includes>
<include>infinispan-remote-libs.mod</include> <include>infinispan-remote-libs.mod</include>

2
jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
View File

@ -16,7 +16,7 @@ sessions/infinispan/remote/infinispan-remote-libs
basehome:modules/sessions/infinispan/remote/resources/hotrod-client.properties|resources/hotrod-client.properties basehome:modules/sessions/infinispan/remote/resources/hotrod-client.properties|resources/hotrod-client.properties
[ini] [ini]
infinispan.version?=9.4.8.Final infinispan.version?=@infinispan.version@
[license] [license]

2
jetty-memcached/jetty-memcached-sessions/pom.xml
View File

@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>com.googlecode.xmemcached</groupId> <groupId>com.googlecode.xmemcached</groupId>
<artifactId>xmemcached</artifactId> <artifactId>xmemcached</artifactId>
<version>2.4.7</version> <version>${xmemcached.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

5
jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
View File

@ -11,7 +11,10 @@ session-store
slf4j-api slf4j-api
[files] [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]
lib/jetty-memcached-sessions-${jetty.version}.jar lib/jetty-memcached-sessions-${jetty.version}.jar

2
jetty-nosql/pom.xml
View File

@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.mongodb</groupId> <groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId> <artifactId>mongo-java-driver</artifactId>
<version>2.13.2</version> <version>${mongodb.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

3
jetty-nosql/src/main/config/modules/session-store-mongo.mod
View File

@ -14,7 +14,7 @@ sessions
sessions/mongo/${connection-type} sessions/mongo/${connection-type}
[files] [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]
lib/jetty-nosql-${jetty.version}.jar lib/jetty-nosql-${jetty.version}.jar
@ -28,6 +28,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html
[ini] [ini]
connection-type?=address connection-type?=address
mongodb.version?=@mongodb.version@
[ini-template] [ini-template]
#jetty.session.mongo.dbName=HttpSessions #jetty.session.mongo.dbName=HttpSessions

25
jetty-server/pom.xml
View File

@ -26,6 +26,31 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources-keystore</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
<resources>
<resource>
<directory>src/main/config</directory>
<includes>
<include>**/**keystore**</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>

21
jetty-unixsocket/pom.xml
View File

@ -82,32 +82,15 @@
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/jnr/\2-\3.jar" byline="true" /> <replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/jnr/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" /> <replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
<concat destfile="${project.build.directory}/unixsocket.mod"> <concat destfile="${project.build.directory}/unixsocket.mod">
<fileset file="src/main/config-template/modules/unixsocket-prefix.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-prefix.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
<fileset file="src/main/config-template/modules/unixsocket-suffix.mod" /> <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-suffix.mod" />
</concat> </concat>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

4
jetty-unixsocket/src/main/assembly/config.xml
View File

@ -7,7 +7,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/config-template</directory> <directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>
@ -18,7 +18,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target</directory> <directory>${project.build.directory}</directory>
<outputDirectory>modules</outputDirectory> <outputDirectory>modules</outputDirectory>
<includes> <includes>
<include>unixsocket.mod</include> <include>unixsocket.mod</include>

2
jetty-util/src/main/config/modules/log4j-impl.mod
View File

@ -28,5 +28,5 @@ Log4j is released under the Apache 2.0 license.
http://www.apache.org/licenses/LICENSE-2.0.html http://www.apache.org/licenses/LICENSE-2.0.html
[ini] [ini]
log4j.version?=1.2.17 log4j.version?=@log4j.version@
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/log4j/ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/log4j/

2
jetty-util/src/main/config/modules/logback-impl.mod
View File

@ -36,5 +36,5 @@ or (per the licensee's choosing) under
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
[ini] [ini]
logback.version?=1.2.3 logback.version?=@logback.version@
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/logback/ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/logback/

2
jetty-util/src/main/config/modules/slf4j-api.mod
View File

@ -16,7 +16,7 @@ maven://org.slf4j/slf4j-api/${slf4j.version}|lib/slf4j/slf4j-api-${slf4j.version
lib/slf4j/slf4j-api-${slf4j.version}.jar lib/slf4j/slf4j-api-${slf4j.version}.jar
[ini] [ini]
slf4j.version?=1.7.30 slf4j.version?=@slf4j.version@
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/ jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/
[license] [license]

132
pom.xml
View File

@ -37,9 +37,11 @@
<gson.version>2.8.8</gson.version> <gson.version>2.8.8</gson.version>
<guava.version>30.1.1-jre</guava.version> <guava.version>30.1.1-jre</guava.version>
<guice.version>5.0.1</guice.version> <guice.version>5.0.1</guice.version>
<hawtio.version>2.13.5</hawtio.version>
<hazelcast.version>3.12.12</hazelcast.version> <hazelcast.version>3.12.12</hazelcast.version>
<infinispan.version>9.4.8.Final</infinispan.version> <infinispan.version>9.4.8.Final</infinispan.version>
<infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version> <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
<jamon.version>2.81</jamon.version>
<javax.activation.version>1.1.0.v201105071233</javax.activation.version> <javax.activation.version>1.1.0.v201105071233</javax.activation.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version> <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version> <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
@ -57,6 +59,7 @@
<jnr-ffi.version>2.2.7</jnr-ffi.version> <jnr-ffi.version>2.2.7</jnr-ffi.version>
<jnr-posix.version>3.1.10</jnr-posix.version> <jnr-posix.version>3.1.10</jnr-posix.version>
<jnr-unixsocket.version>0.38.11</jnr-unixsocket.version> <jnr-unixsocket.version>0.38.11</jnr-unixsocket.version>
<jolokia.version>1.3.3</jolokia.version>
<jsp.version>8.5.70</jsp.version> <jsp.version>8.5.70</jsp.version>
<junit.version>5.8.1</junit.version> <junit.version>5.8.1</junit.version>
<log4j2.version>2.14.0</log4j2.version> <log4j2.version>2.14.0</log4j2.version>
@ -64,6 +67,7 @@
<maven.version>3.8.2</maven.version> <maven.version>3.8.2</maven.version>
<maven.plugin-tools.version>3.6.1</maven.plugin-tools.version> <maven.plugin-tools.version>3.6.1</maven.plugin-tools.version>
<maven.resolver.version>1.7.2</maven.resolver.version> <maven.resolver.version>1.7.2</maven.resolver.version>
<mongodb.version>2.13.2</mongodb.version>
<osgi.annotation.version>8.0.0</osgi.annotation.version> <osgi.annotation.version>8.0.0</osgi.annotation.version>
<osgi.core.version>6.0.0</osgi.core.version> <osgi.core.version>6.0.0</osgi.core.version>
<plexus-container.version>2.1.0</plexus-container.version> <plexus-container.version>2.1.0</plexus-container.version>
@ -72,6 +76,7 @@
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version> <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version> <taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<weld.version>3.1.5.Final</weld.version> <weld.version>3.1.5.Final</weld.version>
<xmemcached.version>2.4.7</xmemcached.version>
<!-- some maven plugins versions --> <!-- some maven plugins versions -->
<asciidoctor.plugin.version>2.2.1</asciidoctor.plugin.version> <asciidoctor.plugin.version>2.2.1</asciidoctor.plugin.version>
@ -508,7 +513,7 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId> <groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-assembly-descriptors</artifactId> <artifactId>jetty-assembly-descriptors</artifactId>
<version>1.0</version> <version>1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -1102,6 +1107,42 @@
<artifactId>ant-launcher</artifactId> <artifactId>ant-launcher</artifactId>
<version>${ant.version}</version> <version>${ant.version}</version>
</dependency> </dependency>
<!-- some modules use those artifacts so we can manage version from here -->
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-default</artifactId>
<version>${hawtio.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.jamonapi</groupId>
<artifactId>jamon</artifactId>
<version>${jamon.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jamonapi</groupId>
<artifactId>jamon_war</artifactId>
<version>${jamon.version}</version>
<type>war</type>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>
<version>${jolokia.version}</version>
<type>war</type>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -1204,6 +1245,36 @@
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
<outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
<resources>
<resource>
<directory>src/main/config</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*keystore</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@ -1224,6 +1295,65 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>config-template</id>
<activation>
<file>
<exists>src/main/config-template</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
<outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
<resources>
<resource>
<directory>src/main/config-template</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.p12</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/config.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile> <profile>
<id>eclipse-release</id> <id>eclipse-release</id>
<modules> <modules>