Skip to content

Commit

Permalink
fix some mod files: some url using http to https, use maven central i…
Browse files Browse the repository at this point in the history
…f possible, upgrade log4j2 to 2.14.0 (#6048)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
  • Loading branch information
olamy committed Mar 10, 2021
1 parent 56864bd commit 06ea681
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion jetty-home/src/main/resources/modules/hawtio.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ etc/hawtio.xml
[files]
etc/hawtio/
lib/hawtio/
https://oss.sonatype.org/content/repositories/public/io/hawt/hawtio-default/1.4.16/hawtio-default-1.4.16.war|lib/hawtio/hawtio.war
maven://io.hawt/hawtio-default/1.4.16|lib/hawtio/hawtio.war
basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml

[license]
Expand Down
8 changes: 4 additions & 4 deletions jetty-home/src/main/resources/modules/jminix.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ etc/jminix.xml
[files]
lib/jminix/
maven://org.jminix/jminix/1.1.0|lib/jminix/jminix-1.1.0.jar
http://maven.restlet.com/org/restlet/org.restlet/1.1.5/org.restlet-1.1.5.jar|lib/jminix/org.restlet-1.1.5.jar
http://maven.restlet.com/org/restlet/org.restlet.ext.velocity/1.1.5/org.restlet.ext.velocity-1.1.5.jar|lib/jminix/org.restlet.ext.velocity-1.1.5.jar
https://maven.restlet.talend.com/org/restlet/org.restlet/1.1.5/org.restlet-1.1.5.jar|lib/jminix/org.restlet-1.1.5.jar
https://maven.restlet.talend.com/org/restlet/org.restlet.ext.velocity/1.1.5/org.restlet.ext.velocity-1.1.5.jar|lib/jminix/org.restlet.ext.velocity-1.1.5.jar
maven://org.apache.velocity/velocity/1.5|lib/jminix/velocity-1.5.jar
maven://oro/oro/2.0.8|lib/jminix/oro-2.0.8.jar
http://maven.restlet.com/com/noelios/restlet/com.noelios.restlet/1.1.5/com.noelios.restlet-1.1.5.jar|lib/jminix/com.noelios.restlet-1.1.5.jar
http://maven.restlet.com/com/noelios/restlet/com.noelios.restlet.ext.servlet/1.1.5/com.noelios.restlet.ext.servlet-1.1.5.jar|lib/jminix/com.noelios.restlet.ext.servlet-1.1.5.jar
https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet/1.1.5/com.noelios.restlet-1.1.5.jar|lib/jminix/com.noelios.restlet-1.1.5.jar
https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet.ext.servlet/1.1.5/com.noelios.restlet.ext.servlet-1.1.5.jar|lib/jminix/com.noelios.restlet.ext.servlet-1.1.5.jar
maven://net.sf.json-lib/json-lib/2.2.3/jar/jdk15|lib/jminix/json-lib-2.2.3-jdk15.jar
maven://commons-lang/commons-lang/2.4|lib/jminix/commons-lang-2.4.jar
maven://commons-beanutils/commons-beanutils/1.7.0|lib/jminix/commons-beanutils-1.7.0.jar
Expand Down
2 changes: 1 addition & 1 deletion jetty-home/src/main/resources/modules/logging-log4j2.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lib/logging/log4j-api-${log4j.version}.jar
lib/logging/log4j-core-${log4j.version}.jar

[ini]
log4j.version?=2.13.0
log4j.version?=2.14.0
jetty.webapp.addServerClasses+=,org.apache.logging.log4j.

[license]
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
<build-support.version>1.5</build-support.version>
<checkstyle.version>8.37</checkstyle.version>
<slf4j.version>2.0.0-alpha1</slf4j.version>
<log4j2.version>2.13.0</log4j2.version>
<log4j2.version>2.14.0</log4j2.version>
<logback.version>1.3.0-alpha5</logback.version>
<disruptor.version>3.4.2</disruptor.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
<servlet.api.version>4.0.6</servlet.api.version>
<websocket.api.version>1.1.2</websocket.api.version>
Expand Down

0 comments on commit 06ea681

Please sign in to comment.