Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for version increment error #143

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Fix for version increment error #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclientjava;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclientjava
Expand Down
2 changes: 1 addition & 1 deletion providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.filetransfer.httpclientjava</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
6 changes: 3 additions & 3 deletions ...ientjava/src/org/eclipse/ecf/internal/provider/filetransfer/httpclientjava/Activator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void removedService(ServiceReference<HttpClient> reference, HttpClient se
private static final String USE_SHARED_CLIENT_DEFAULT = "true"; //$NON-NLS-1$

/**
* @since 2.0
* @since 2.1
*/
public static final String USE_COOKIE_STORE = PLUGIN_ID + ".cookieStore"; //$NON-NLS-1$

Expand Down Expand Up @@ -220,7 +220,7 @@ public boolean isUseSharedClient() {
}

/**
* @since 2.0
* @since 2.1
*/
public boolean isUseCookieStore() {
return useCookieStore;
Expand All @@ -247,7 +247,7 @@ public void log(IStatus status) {
}

/**
* @since 2.0
* @since 2.1
*/
public synchronized SSLContextFactory getSSLContextFactory() {
if (sslContextFactoryTracker == null) {
Expand Down
4 changes: 2 additions & 2 deletions ...lientjava/src/org/eclipse/ecf/provider/filetransfer/httpclientjava/HttpClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public interface HttpClientOptions {
String FORCE_NTLM_PROP = "org.eclipse.ecf.provider.filetransfer.httpclient4.options.ForceNTLMProxy"; //$NON-NLS-1$

/**
* @since 2.0
* @since 2.1
*/
String HTTPCLIENT_SSLCONTEXT_PROTOCOL = System.getProperty("org.eclipse.ecf.provider.filetransfer.httpclient.sslcontext.protocol"); //$NON-NLS-1$

/**
* @since 2.0
* @since 2.1
*/
String HTTPCLIENT_SSLCONTEXT_PROVIDER = System.getProperty("org.eclipse.ecf.provider.filetransfer.httpclient.sslcontext.provider"); //$NON-NLS-1$
}
Loading