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

Util: Rename modified apache classes (Gitlab ticket #353)

Browse Source 
to avoid conflict in applications linking to apache jars
As requested by 'mesh' project
Remove with-libhttpclient-java build option
No known external uses other than obsolete i2pcontrol plugin
This commit is contained in:
zzz
2022-05-11 07:54:56 -04:00
parent bf27bf140d
commit 07dbab9f02
20 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/build.xml
View File

@@ -43,13 +43,6 @@
<condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >
<istrue value="${with-libgetopt-java}" />
</condition>
<!-- fixups if we're using httpclient.jar and httpcore.jar for org.apache.http classes -->
<condition property="source.exclude3" value="org/apache/http/**" else="NOTHING" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<condition property="javac.classpath.mod3" value="build/httpclient.jar:build/httpcore.jar:" else="" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<!-- fixups if we're using json-simple.jar for org.json.simple classes -->
<condition property="source.exclude4" value="org/json/simple/**" else="NOTHING" >
<istrue value="${with-libjson-simple-java}" />
@@ -57,7 +50,7 @@
<condition property="javac.classpath.mod4" value="build/json-simple.jar:" else="" >
<istrue value="${with-libjson-simple-java}" />
</condition>
<property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath.mod4}${javac.classpath}" />
<property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod4}${javac.classpath}" />
<!-- jar classpath fixups -->
<condition property="gettext.jar" value="/usr/share/java/libintl.jar" else="" >
@@ -66,9 +59,6 @@
<condition property="getopt.jar" value="/usr/share/java/gnu-getopt.jar" else="" >
<istrue value="${with-libgetopt-java}" />
</condition>
<condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" >
<istrue value="${with-libhttpclient-java}" />
</condition>
<condition property="json-simple.jar" value="/usr/share/java/json-simple.jar" else="" >
<istrue value="${with-libjson-simple-java}" />
</condition>
@@ -87,7 +77,6 @@
<include name="**/*.java" />
<exclude name="${source.exclude1}" />
<exclude name="${source.exclude2}" />
<exclude name="${source.exclude3}" />
<exclude name="${source.exclude4}" />
</javac>
</target>
@@ -118,7 +107,7 @@
<!-- the getopt translation files -->
<fileset dir="src" includes="${translation.includes}" />
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
@@ -341,7 +330,7 @@
</copy>
<jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class">
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
@@ -371,7 +360,7 @@
<!-- the getopt translation files -->
<fileset dir="src" includes="${translation.includes}" />
<manifest>
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />
<attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar}" />
<attribute name="Specification-Title" value="I2P Core API" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />