Skip to content

Commit f62be15

Browse files
authoredApr 3, 2024··
Merge pull request #96 from scottslewis/master
Merge from 3_15 branch
2 parents 28753b9 + 079e5de commit f62be15

File tree

52 files changed

+800
-1328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+800
-1328
lines changed
 

‎doc/bundles/org.eclipse.ecf.doc/build.properties

-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ jars.extra.classpath = platform:/plugin/org.eclipse.ecf,\
3232
platform:/plugin/org.eclipse.ecf.provider,\
3333
platform:/plugin/org.eclipse.ecf.provider.dnssd,\
3434
platform:/plugin/org.eclipse.ecf.provider.filetransfer,\
35-
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient4,\
3635
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient45,\
3736
platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient5,\
3837
platform:/plugin/org.eclipse.ecf.provider.jslp,\
3938
platform:/plugin/org.eclipse.ecf.provider.remoteservice,\
4039
platform:/plugin/org.eclipse.ecf.provider.r_osgi,\
41-
platform:/plugin/org.eclipse.ecf.provider.zookeeper,\
4240
platform:/plugin/org.eclipse.ecf.remoteservice,\
4341
platform:/plugin/org.eclipse.ecf.remoteservice.asyncproxy,\
4442
platform:/plugin/org.eclipse.ecf.remoteservice.eventadmin,\

‎doc/bundles/org.eclipse.ecf.doc/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<additionalArgument>-Xdoclint:none</additionalArgument>
3131
<additionalArgument>-splitindex</additionalArgument>
3232
<additionalArgument>-use</additionalArgument>
33-
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
34-
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
33+
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
34+
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
3535
<additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
3636
<additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
3737
<additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>

0 commit comments

Comments
 (0)
Please sign in to comment.