Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Allow Servlet 4 in OSGi environment. (#191)

Browse Source 
Co-authored-by: Gary Gregory <garydgregory@users.noreply.github.com>
This commit is contained in:
Václav Haisman
2024-03-17 15:06:44 +01:00
committed by GitHub
parent 3fcbbb25d3
commit 446a642732
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -251,7 +251,7 @@ under the License.
--> -->
<log4j12>${org.apache.logging.log4j:log4j-1.2-api:jar}</log4j12> <log4j12>${org.apache.logging.log4j:log4j-1.2-api:jar}</log4j12>
<logkit>${logkit:logkit:jar}</logkit> <logkit>${logkit:logkit:jar}</logkit>
<servlet-api>${javax.servlet:servlet-api:jar}</servlet-api> <servlet-api>${javax.servlet:javax.servlet-api:jar}</servlet-api>
<commons-logging>target/${project.build.finalName}.jar</commons-logging> <commons-logging>target/${project.build.finalName}.jar</commons-logging>
<commons-logging-api>target/${project.build.finalName}-api.jar</commons-logging-api> <commons-logging-api>target/${project.build.finalName}-api.jar</commons-logging-api>
<commons-logging-adapters>target/${project.build.finalName}-adapters.jar</commons-logging-adapters> <commons-logging-adapters>target/${project.build.finalName}-adapters.jar</commons-logging-adapters>
@@ -550,8 +550,8 @@ under the License.
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>2.5</version> <version>4.0.1</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@@ -669,7 +669,7 @@ under the License.
<slf4j.version>2.0.12</slf4j.version> <slf4j.version>2.0.12</slf4j.version>
<findsecbugs.version>1.13.0</findsecbugs.version> <findsecbugs.version>1.13.0</findsecbugs.version>
<commons.osgi.import> <commons.osgi.import>
javax.servlet;version="[2.1.0, 3.0.0)";resolution:=optional, javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional,
org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional, org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional,
org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional,