Upgrade OSGI annotations to 6.0.0 version #326

plutasnyy · 2018-08-14T13:41:19Z

OSGI annotations was upgraded to 6.0.0 version because previous version was marked as deprecated

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.

I hereby agree to the terms of the AET Contributor License Agreement.

Updates for Pull request #306

added new positions to CHANGELOG associated with new osgi annotations

tkaik · 2018-08-16T08:50:01Z

documentation/src/main/wiki/UpgradeNotes.md

+
+With the update osgi annotations to 6.0.0 version we had to change a little bit variable names. Currently, your config could has old names and you have to update them. Please follow instruction below:
+
+1. Open `aet\osgi-dependencies\configs\src\main\resources`


aet\osgi-dependencies\configs\src\main\resources is just a directory in AET repo - it's not the place which needs to be modified when someone is upgrading some environement from previous AET version. Those changes need to be made somewhere in Karaf installation directory, where the AET config files are kept - by default (when using aet-cookbook) they're located in /opt/aet/karaf/aet_configs/current

tkaik · 2018-08-16T08:54:39Z

documentation/src/main/wiki/UpgradeNotes.md

@@ -7,3 +7,29 @@ You may see all changes in the [Changelog](https://github.com/Cognifide/aet/blob

 ## Unreleased

+### [PR-326](https://github.com/Cognifide/aet/pull/326) Upgrade OSGI annotations to 6.0.0 version
+
+With the update osgi annotations to 6.0.0 version we had to change a little bit variable names. Currently, your config could has old names and you have to update them. Please follow instruction below:


Please fix grammar (correct me if I'm wrong, but I think it should be like this):
config could has -> config could have
With the update osgi annotations to 6.0.0 -> With the OSGI annotations update to 6.0.0

PiteroS678 · 2018-08-16T09:08:11Z

core/cleaner/src/main/java/com/cognifide/aet/cleaner/CleanerScheduler.java

-        .put(CleanerJob.KEY_COMPANY_FILTER, companyName)
-        .put(CleanerJob.KEY_PROJECT_FILTER, projectName)
-        .put(CleanerJob.KEY_DRY_RUN, dryRun)
+        .put(CleanerJob.KEY_REMOVE_OLDER_THAN, config.removeOlderThan())


Please add .put(CleanerJob.KEY_KEEP_N_VERSIONS, config.keepNVersions()). We don't have equivalent for .put(CleanerJob.KEY_KEEP_N_VERSIONS, keepNVersions)

tkaik · 2018-08-16T14:28:13Z

core/runner/src/main/java/com/cognifide/aet/runner/configuration/RunnerConfigurationConf.java

+
+  String PARAM_FAILURE_TIMEOUT = "ft";
+
+  String PARAM_MESSAGE_TTL = "mttl";


This is used as a label now - please change to Message TTL (and similarily for other constants here)

tkaik · 2018-08-16T14:28:39Z

core/runner/src/main/java/com/cognifide/aet/runner/configuration/RunnerConfigurationConf.java

+
+  int DEFAULT_TASK_RUN_FAILURE_TIMEOUT_SECONDS = 120;
+
+  String PARAM_FAILURE_TIMEOUT = "ft";


This is used as a label now - please change to "Failure timeout"

Done ;) 09bb97b

tkaik · 2018-08-17T07:37:33Z

core/cleaner/src/main/java/com/cognifide/aet/cleaner/configuration/CleanerSchedulerConf.java

+
+  String SCHEDULE_CRON = "schedule";
+
+  String DRY_RUN = "dryRun";


All above constants should be changed to labels which were used in old annotations

tkaik · 2018-08-17T07:38:24Z

...obs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollectorFactory.java


-@Component(description = "AET Screen Collector Factory", label = "AET Screen Collector Factory")
-@Service
+@Component(service = CollectorFactory.class)


(service = CollectorFactory.class) is redundant - type of directly implemented interface is the default service value

tkaik · 2018-08-17T07:39:06Z

...obs/src/main/java/com/cognifide/aet/job/common/collectors/source/SourceCollectorFactory.java


-@Component(metatype = true, description = "AET Source Collector Factory", label = "AET Source Collector Factory")
-@Service
+@Component(service = CollectorFactory.class)


(service = CollectorFactory.class) is redundant - type of directly implemented interface is the default service value

malaskowski · 2018-08-21T07:10:50Z

documentation/src/main/wiki/UpgradeNotes.md

+
+With the OSGI annotations update to 6.0.0 version we had to change a little bit variable names. Currently, your config could have old names and you have to update them. Please follow instruction below:
+
+1. Open `/opt/aet/karaf/aet_configs/current`


Modify following OSGi config files (by default they should be located in /opt/aet/karaf/aet_configs/current):
// table

Remove list numeration.

Ewa Fengler and others added 30 commits August 3, 2018 13:39

update pom for new osgi annotations

3c9b086

add dependencies to worker module

85e16c4

update annotations in ChromeWebDriverFactory

65f2f8e

update annotations in FirefoxWebDriverFactory

3ec6946

update annotations in HttpRequestExecutorFactoryImpl

65d3fb8

update annotations in WebDriverProvider

444271f

update annotations in worker/impl

e834ee0

fix missing service parameter

0c9794a

updated osgi annotations in runner

e68f7a6

removed unused interfaces

55b8f02

removed unused function

e0159f2

change scopes in pom

0c7164d

removed names

dcd7d62

updated annotations in test executor

375fda5

Removing dependency to SCR annotations

1d18fb8

removing powermock dependencies

df37aea

Merge pull request #309 from Cognifide/updates

ce55cae

Updates for Pull request #306

added todo in runner pom xml

2c4405d

new OSGi annotations - proxy

7eb8aec

update annotations in worker/listeners

2d22451

new OSGi annotations - validation

38d0262

remove wildcard import

7d2b474

remove formatting changes in license header

2c31feb

updated osgi annotatation in jobs

9720686

updated pom.xml

0079d6f

change conf to config

ce65974

move constants from WebDriverHelper

c6dad83

removed dependencies

c0d8b80

removed unused variables

2e97d91

remove wildcard import

1974b97

plutasnyy and others added 2 commits August 16, 2018 10:03

Merge pull request #319 from Cognifide/update-changelog-osgi-annotation

db2067c

added new positions to CHANGELOG associated with new osgi annotations

updted changelog

6ae35f7

tkaik reviewed Aug 16, 2018

View reviewed changes

PiteroS678 reviewed Aug 16, 2018

View reviewed changes

plutasnyy added 5 commits August 16, 2018 11:39

update upgrade notes

8eb9f64

added cleanerjob

27eae04

remove names

17acdf7

small rafactor in worker module

e6e0101

changed web driver helper

b807121

tkaik reviewed Aug 16, 2018

View reviewed changes

update labels in runner configuration

09bb97b

tkaik reviewed Aug 17, 2018

View reviewed changes

PiteroS678 added 2 commits August 17, 2018 09:58

redundancy in annotations removed

d73e63b

constants update

dab4795

tkaik approved these changes Aug 17, 2018

View reviewed changes

fix method name

77f33a5

malaskowski reviewed Aug 21, 2018

View reviewed changes

plutasnyy added 2 commits August 21, 2018 12:36

Update UpgradeNotes.md

f446bd7

Update UpgradeNotes.md

7dd7083

malaskowski approved these changes Aug 21, 2018

View reviewed changes

Merge branch 'master' into feature/upgrade-osgi-annotations

dd8f9e2

tkaik merged commit 5f4e759 into master Aug 21, 2018

tkaik deleted the feature/upgrade-osgi-annotations branch August 21, 2018 13:00

plutasnyy mentioned this pull request Aug 29, 2018

Add designate to default jms connection #339

Merged

6 tasks

malaskowski mentioned this pull request Sep 3, 2018

Fixed NPE in Cleaner Scheduler after migrating to OSGi 6 #350

Merged

6 tasks

tkaik mentioned this pull request Sep 20, 2018

Convert JMX message ttl from sec to millis #364

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade OSGI annotations to 6.0.0 version #326

Upgrade OSGI annotations to 6.0.0 version #326

plutasnyy commented Aug 14, 2018

tkaik Aug 16, 2018

tkaik Aug 16, 2018

plutasnyy Aug 16, 2018

PiteroS678 Aug 16, 2018 •

edited

Loading

plutasnyy Aug 16, 2018

tkaik Aug 16, 2018 •

edited

Loading

tkaik Aug 16, 2018

plutasnyy Aug 16, 2018 •

edited

Loading

tkaik Aug 17, 2018

tkaik Aug 17, 2018 •

edited

Loading

tkaik Aug 17, 2018

malaskowski Aug 21, 2018


		With the update osgi annotations to 6.0.0 version we had to change a little bit variable names. Currently, your config could has old names and you have to update them. Please follow instruction below:

		1. Open `aet\osgi-dependencies\configs\src\main\resources`


		String PARAM_FAILURE_TIMEOUT = "ft";

		String PARAM_MESSAGE_TTL = "mttl";


		int DEFAULT_TASK_RUN_FAILURE_TIMEOUT_SECONDS = 120;

		String PARAM_FAILURE_TIMEOUT = "ft";


		String SCHEDULE_CRON = "schedule";

		String DRY_RUN = "dryRun";


		With the OSGI annotations update to 6.0.0 version we had to change a little bit variable names. Currently, your config could have old names and you have to update them. Please follow instruction below:

		1. Open `/opt/aet/karaf/aet_configs/current`

Upgrade OSGI annotations to 6.0.0 version #326

Upgrade OSGI annotations to 6.0.0 version #326

Conversation

plutasnyy commented Aug 14, 2018

Types of changes

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PiteroS678 Aug 16, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tkaik Aug 16, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plutasnyy Aug 16, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tkaik Aug 17, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PiteroS678 Aug 16, 2018 •

edited

Loading

tkaik Aug 16, 2018 •

edited

Loading

plutasnyy Aug 16, 2018 •

edited

Loading

tkaik Aug 17, 2018 •

edited

Loading