Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #3514 backport of mod files filtering #6897

Merged
merged 5 commits into from Sep 24, 2021
Merged

Issue #3514 backport of mod files filtering #6897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7391590
Issue #3514 backport of mod files filtering
olamy Sep 23, 2021
693516f
ignore keystore file
olamy Sep 23, 2021
3b1a71b
fix directory name
olamy Sep 23, 2021
d276928
fix directory name
olamy Sep 23, 2021
c89526c
fix inclusion of keystore file
olamy Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 1 addition & 18 deletions jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View file
Open in desktop
Expand Up @@ -128,31 +128,14 @@
<configuration>
<target>
<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" />
</concat>
</target>
</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>

Expand Down
4 changes: 2 additions & 2 deletions jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</formats>
<fileSets>
<fileSet>
<directory>src/main/config-template</directory>
<directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
Expand All @@ -17,7 +17,7 @@
</excludes>
</fileSet>
<fileSet>
<directory>target</directory>
<directory>${project.build.directory}</directory>
<outputDirectory>modules</outputDirectory>
<includes>
<include>gcloud-datastore.mod</include>
Expand Down
2 changes: 1 addition & 1 deletion jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
View file
Open in desktop
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
View file
Open in desktop
Expand Up @@ -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.

Expand Down
6 changes: 6 additions & 0 deletions jetty-home/pom.xml
View file
Open in desktop
Expand Up @@ -33,9 +33,15 @@
<useBuildFilters>false</useBuildFilters>
<includeEmptyDirs>true</includeEmptyDirs>
<outputDirectory>${assembly-directory}</outputDirectory>
<encoding>UTF-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion jetty-home/src/main/resources/modules/conscrypt.mod
View file
Open in desktop
Expand Up @@ -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
5 changes: 4 additions & 1 deletion jetty-home/src/main/resources/modules/hawtio.mod
View file
Open in desktop
Expand Up @@ -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/
Expand Down
7 changes: 5 additions & 2 deletions jetty-home/src/main/resources/modules/jamon.mod
View file
Open in desktop
Expand Up @@ -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]
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion jetty-home/src/main/resources/modules/jolokia.mod
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
View file
Open in desktop
Expand Up @@ -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.
Expand Down
19 changes: 1 addition & 18 deletions jetty-infinispan/infinispan-embedded-query/pom.xml
View file
Open in desktop
Expand Up @@ -60,31 +60,14 @@
<configuration>
<target>
<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" />
</concat>
</target>
</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>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</formats>
<fileSets>
<fileSet>
<directory>src/main/config-template</directory>
<directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
Expand All @@ -17,7 +17,7 @@
</excludes>
</fileSet>
<fileSet>
<directory>target</directory>
<directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
<includes>
<include>infinispan-embedded-query-libs.mod</include>
Expand Down
19 changes: 1 addition & 18 deletions jetty-infinispan/infinispan-embedded/pom.xml
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@
<configuration>
<target>
<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" />
</concat>
</target>
Expand All @@ -70,23 +70,6 @@
</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>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</formats>
<fileSets>
<fileSet>
<directory>src/main/config-templates</directory>
<directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
Expand All @@ -17,7 +17,7 @@
</excludes>
</fileSet>
<fileSet>
<directory>target</directory>
<directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
<includes>
<include>infinispan-embedded-libs.mod</include>
Expand Down
0 ...ssions/infinispan/infinispan-embedded.xml → ...ssions/infinispan/infinispan-embedded.xml
View file
Open in desktop
File renamed without changes.
0 ...templates/modules/infinispan-embedded.mod → ...-template/modules/infinispan-embedded.mod
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...les/session-store-infinispan-embedded.mod → ...les/session-store-infinispan-embedded.mod
View file
Open in desktop
Expand Up @@ -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
Expand Down
0 ...pan/embedded/infinispan-embedded-libs.mod → ...pan/embedded/infinispan-embedded-libs.mod
View file
Open in desktop
File renamed without changes.
0 ...ded/infinispan-embedded-serverclasses.mod → ...ded/infinispan-embedded-serverclasses.mod
View file
Open in desktop
File renamed without changes.
0 ...ssions/infinispan/embedded/infinispan.xml → ...ssions/infinispan/embedded/infinispan.xml
View file
Open in desktop
File renamed without changes.
19 changes: 1 addition & 18 deletions jetty-infinispan/infinispan-remote-query/pom.xml
View file
Open in desktop
Expand Up @@ -61,31 +61,14 @@
<configuration>
<target>
<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" />
</concat>
</target>
</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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</formats>
<fileSets>
<fileSet>
<directory>src/main/config-template</directory>
<directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
Expand All @@ -17,7 +17,7 @@
</excludes>
</fileSet>
<fileSet>
<directory>target</directory>
<directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
<includes>
<include>infinispan-remote-query-libs.mod</include>
Expand Down
20 changes: 1 addition & 19 deletions jetty-infinispan/infinispan-remote/pom.xml
View file
Open in desktop
Expand Up @@ -62,32 +62,14 @@
<configuration>
<target>
<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" />
</concat>
</target>
</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>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</formats>
<fileSets>
<fileSet>
<directory>src/main/config-template</directory>
<directory>${project.build.directory}/jetty-config-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
Expand All @@ -17,7 +17,7 @@
</excludes>
</fileSet>
<fileSet>
<directory>target</directory>
<directory>${project.build.directory}</directory>
<outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
<includes>
<include>infinispan-remote-libs.mod</include>
Expand Down
2 changes: 1 addition & 1 deletion ...an/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
View file
Open in desktop
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion jetty-memcached/jetty-memcached-sessions/pom.xml
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.googlecode.xmemcached</groupId>
<artifactId>xmemcached</artifactId>
<version>2.4.7</version>
<version>${xmemcached.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
5 changes: 4 additions & 1 deletion ...tty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
View file
Open in desktop
Expand Up @@ -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
Expand Down