vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-22 18:48:00 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
	smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
This commit is contained in:
Florian Schmaus 2014-07-28 00:05:02 +02:00
commit 6bf0678db6
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build.gradle
View file

@ -227,7 +227,7 @@ subprojects {
}
}
['smack-resolver-javax', 'smack-extensions', 'smack-experimental', 'smack-legacy'].each { name ->
['smack-extensions', 'smack-experimental', 'smack-legacy'].each { name ->
project(":$name") {
jar {
manifest {
@ -237,6 +237,16 @@ subprojects {
}
}
['smack-resolver-javax'].each { name ->
project(":$name") {
jar {
manifest {
instruction 'Service-Component', "org.jivesoftware.smack/$name-components.xml"
}
}
}
}
subprojects*.jar {
manifest {
from sharedManifest
@ -252,4 +262,4 @@ def getGitCommit() {
def gitCommit = proc.text.trim()
assert !gitCommit.isEmpty()
gitCommit
}
}

11
resources/releasedocs/changelog.html
View file

@ -141,6 +141,17 @@ hr {
<div id="pageBody">
<h2>4.0.2 -- <span style="font-weight: normal;">2014-07-27</span></h2>
<h2> Improvement
</h2>
<ul>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-576'>SMACK-576</a>] - smack-resolver-javax should become a OSGi ServiceComponent
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-586'>SMACK-586</a>] - Extend API to configure a HostnameVerifier
</li>
</ul>
<h2>4.0.1 -- <span style="font-weight: normal;">2014-07-20</span></h2>
<h2> Sub-task