zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Use non-versioned file for slf4j2 jar
Some checks failed
Java CI / build (push) Has been cancelled
Details
Java CI / javadoc-latest (push) Has been cancelled
Details
Java CI / build-java7 (push) Has been cancelled
Details
Java with IzPack Snapshot Setup / setup (push) Has been cancelled
Details
Sync Primary Repository to GitHub Mirror / sync (push) Has been cancelled
Details

Browse Source
This commit is contained in:
zzz
2025-05-28 17:19:14 -04:00
parent f560d2cb2a
commit aa95568121
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/apparmor/i2p vendored
View File

@ -74,6 +74,7 @@
/usr/share/java/servlet-api.jar r, /usr/share/java/servlet-api.jar r,
/usr/share/java/servlet-api-*.jar r, /usr/share/java/servlet-api-*.jar r,
/usr/share/java/slf4j-*.jar r, /usr/share/java/slf4j-*.jar r,
/usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar r,
/usr/share/java/standard.jar r, /usr/share/java/standard.jar r,
/usr/share/java/standard-*.jar r, /usr/share/java/standard-*.jar r,
/usr/share/java/tomcat9-*.jar r, /usr/share/java/tomcat9-*.jar r,

4
debian/i2p-router.links vendored
View File

@ -37,8 +37,8 @@ usr/share/java/jetty12-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
usr/share/java/servlet-api.jar usr/share/i2p/lib/javax.servlet.jar usr/share/java/servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
# combined into javax.servlet.jar in non-package builds # combined into javax.servlet.jar in non-package builds
usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar
# the libslf4j-java package does NOT provide a non-versioned file # the libslf4j2-java package does NOT provide a non-versioned file except in the maven-repo dir
usr/share/java/slf4j-api-2.0.17.jar usr/share/i2p/lib/slf4j-api.jar usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar usr/share/i2p/lib/slf4j-api.jar
# comment out if not building with libtomcat9-java # comment out if not building with libtomcat9-java

4
debian/rules vendored
View File

@ -126,8 +126,8 @@ endif
ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# the libslf4j-java package does NOT provide a non-versioned file @# the libslf4j2-java package does NOT provide a non-versioned file except in the maven-repo dir
ln -sf /usr/share/java/slf4j-api-2.0.17.jar $(CURDIR)/apps/jetty/jettylib/slf4j-api.jar ln -sf /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar $(CURDIR)/apps/jetty/jettylib/slf4j-api.jar
@# debian and ubuntu: buster, disco @# debian and ubuntu: buster, disco
@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties