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

Tzapirtan story 1934089 update java sdk eclipse #122

Merged
merged 2 commits into from
Oct 4, 2022
+22 −34
Merged

Tzapirtan story 1934089 update java sdk eclipse #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06745d5
Story #1934089: SDK update to version 16.0.400.1
Sep 27, 2022
21a7463
Story #1934089: reverted change of classpathentry from .classpath
Sep 27, 2022
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
24 changes: 12 additions & 12 deletions octane-eclipse-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="octane.eclipse.feature"
label="ALM Octane IDE Integration"
version="2022.0.0"
version="2022.1.0"
provider-name="Micro Focus">

<description url="https://software.microfocus.com/en-us/products/alm-octane/overview">
Expand All @@ -14,17 +14,17 @@
</copyright>

<license url="http://www.apache.org/licenses/LICENSE-2.0">
© Copyright 2017-2022 Micro Focus or one of its affiliates.
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
© Copyright 2017-2022 Micro Focus or one of its affiliates.
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
Comment on lines +17 to +27
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ctrl alt L / ctrl alt o?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no... but i can't figure it out, texts are the same... probably some whitespace

limitations under the License.
</license>

Expand Down
2 changes: 1 addition & 1 deletion octane-eclipse-feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>..</relativePath>
<groupId>com.hpe.adm.octane.ideplugins</groupId>
<artifactId>octane-eclipse-parent</artifactId>
<version>2022.0.0</version>
<version>2022.1.0</version>
</parent>
<artifactId>octane.eclipse.feature</artifactId>
<packaging>eclipse-feature</packaging>
Expand Down
4 changes: 0 additions & 4 deletions octane-eclipse-plugin/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@
<classpathentry exported="true" kind="lib" path="lib/commons-collections.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-api-client-gson.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-api-client-jackson2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-api-client.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-http-client-gson.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-http-client-jackson2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-http-client.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-oauth-client.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gson.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guice.jar"/>
Expand Down
6 changes: 1 addition & 5 deletions octane-eclipse-plugin/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: ALM Octane IDE Plugin
Bundle-SymbolicName: octane.eclipse.plugin;singleton:=true
Bundle-Version: 2022.0.0
Bundle-Version: 2022.1.0
Bundle-Vendor: Micro Focus
Bundle-Activator: com.hpe.octane.ideplugins.eclipse.Activator
Require-Bundle: org.eclipse.core.runtime,
Expand All @@ -29,13 +29,9 @@ Bundle-ClassPath: .,
lib/commons-collections.jar,
lib/commons-lang.jar,
lib/commons-logging.jar,
lib/google-api-client-gson.jar,
lib/google-api-client-jackson2.jar,
lib/google-api-client.jar,
lib/google-http-client-gson.jar,
lib/google-http-client-jackson2.jar,
lib/google-http-client.jar,
lib/google-oauth-client.jar,
lib/gson.jar,
lib/guava.jar,
lib/guice.jar,
Expand Down
4 changes: 0 additions & 4 deletions octane-eclipse-plugin/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ bin.includes = plugin.xml,\
lib/commons-collections.jar,\
lib/commons-lang.jar,\
lib/commons-logging.jar,\
lib/google-api-client-gson.jar,\
lib/google-api-client-jackson2.jar,\
lib/google-api-client.jar,\
lib/google-http-client-gson.jar,\
lib/google-http-client-jackson2.jar,\
lib/google-http-client.jar,\
lib/google-oauth-client.jar,\
lib/gson.jar,\
lib/guava.jar,\
lib/guice.jar,\
Expand Down
2 changes: 1 addition & 1 deletion octane-eclipse-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.hpe.adm.octane.ideplugins</groupId>
<artifactId>octane-eclipse-parent</artifactId>
<version>2022.0.0</version>
<version>2022.1.0</version>
</parent>
<artifactId>octane.eclipse.plugin</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
4 changes: 2 additions & 2 deletions octane-eclipse-plugin/src/com/hpe/octane/ideplugins/eclipse/Activator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;

import com.hpe.adm.nga.sdk.authentication.Authentication;
import com.hpe.adm.nga.sdk.authentication.JSONAuthentication;
import com.hpe.adm.octane.ideplugins.services.connection.BasicConnectionSettingProvider;
import com.hpe.adm.octane.ideplugins.services.connection.ConnectionSettings;
import com.hpe.adm.octane.ideplugins.services.connection.HttpClientProvider;
Expand Down Expand Up @@ -154,7 +154,7 @@ public void start(BundleContext context) throws Exception {
settingsProviderInstance.setConnectionSettings(new ConnectionSettings());
} else {

Authentication authentication;
JSONAuthentication authentication;

if (Boolean.parseBoolean(isBrowserAuth)) {
authentication = new GrantTokenAuthentication();
Expand Down
2 changes: 1 addition & 1 deletion ...clipse-plugin/src/com/hpe/octane/ideplugins/eclipse/preferences/PluginPreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ private ConnectionSettings testConnection() {
UserAuthentication userAuthentication = (UserAuthentication) newConnectionSettings.getAuthentication();

try {
validateUsernameAndPassword(userAuthentication.getUserName(), userAuthentication.getPassword());
validateUsernameAndPassword(userAuthentication.getAuthenticationId(), userAuthentication.getAuthenticationSecret());
} catch (ServiceException e) {
setConnectionStatus(false, e.getMessage());
return null;
Expand Down
2 changes: 1 addition & 1 deletion octane-eclipse-update-site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>..</relativePath>
<groupId>com.hpe.adm.octane.ideplugins</groupId>
<artifactId>octane-eclipse-parent</artifactId>
<version>2022.0.0</version>
<version>2022.1.0</version>
</parent>
<artifactId>octane-eclispse-update-site</artifactId>
<packaging>eclipse-update-site</packaging>
Expand Down
2 changes: 1 addition & 1 deletion octane-eclipse-update-site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<description name="ALM Octane IDE Integration Update Site" url="http://microfocus.github.io/octane-eclipse-plugin/update-site/">
Install the latest verison of the ALM Octane IDE Integration
</description>
<feature url="features/octane.eclipse.feature_2022.0.0.jar" id="octane.eclipse.feature" version="2022.0.0">
<feature url="features/octane.eclipse.feature_2022.1.0.jar" id="octane.eclipse.feature" version="2022.1.0">
<category name="alm.octane"/>
</feature>
<category-def name="alm.octane" label="ALM Octane"/>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.hpe.adm.octane.ideplugins</groupId>
<artifactId>octane-eclipse-parent</artifactId>
<version>2022.0.0</version>
<version>2022.1.0</version>
<packaging>pom</packaging>

<modules>
Expand All @@ -20,7 +20,7 @@
<logback.version>1.2.9</logback.version>

<tycho-version>1.7.0</tycho-version>
<octane.common.version>1.7.2</octane.common.version>
<octane.common.version>1.8.0-SNAPSHOT</octane.common.version>
<java.version>11</java.version>
<signhp.version>15.0</signhp.version>
<sign-hp-utility.version>1.0.5</sign-hp-utility.version>
Expand Down