-
Notifications
You must be signed in to change notification settings - Fork 49
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.
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
Upgrade OSGI annotations to 6.0.0 version #326
Conversation
Updates for Pull request #306
added new positions to CHANGELOG associated with new osgi annotations
|
||
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` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
@@ -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: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
.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()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add .put(CleanerJob.KEY_KEEP_N_VERSIONS, config.keepNVersions())
. We don't have equivalent for .put(CleanerJob.KEY_KEEP_N_VERSIONS, keepNVersions)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
|
||
String PARAM_FAILURE_TIMEOUT = "ft"; | ||
|
||
String PARAM_MESSAGE_TTL = "mttl"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is used as a label now - please change to Message TTL
(and similarily for other constants here)
|
||
int DEFAULT_TASK_RUN_FAILURE_TIMEOUT_SECONDS = 120; | ||
|
||
String PARAM_FAILURE_TIMEOUT = "ft"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is used as a label now - please change to "Failure timeout"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done ;) 09bb97b
|
||
String SCHEDULE_CRON = "schedule"; | ||
|
||
String DRY_RUN = "dryRun"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All above constants should be changed to label
s which were used in old annotations
|
||
@Component(description = "AET Screen Collector Factory", label = "AET Screen Collector Factory") | ||
@Service | ||
@Component(service = CollectorFactory.class) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(service = CollectorFactory.class)
is redundant - type of directly implemented interface is the default service
value
|
||
@Component(metatype = true, description = "AET Source Collector Factory", label = "AET Source Collector Factory") | ||
@Service | ||
@Component(service = CollectorFactory.class) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(service = CollectorFactory.class)
is redundant - type of directly implemented interface is the default service value
|
||
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` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modify following OSGi config files (by default they should be located in
/opt/aet/karaf/aet_configs/current
):
// table
Remove list numeration.
OSGI annotations was upgraded to 6.0.0 version because previous version was marked as deprecated
Types of changes
Checklist:
I hereby agree to the terms of the AET Contributor License Agreement.