Update osgi annotations in rest endpoint #310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
plutasnyy
changed the base branch from
master
to
feature/upgrade-osgi-annotations
plutasnyy
force-pushed
the
update-osgi-annotations-rest-endpoint
branch
from
05e8a7a
to
85c8504
Compare
malaskowski
suggested changes
Aug 8, 2018
There was a problem hiding this comment.
Code from this PR is not compiling. Travis log says:
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m
/home/travis/build/Cognifide/aet/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/ReportConfigurationManager.java:[18,51] error: package com.cognifide.aet.rest.helpers.configuration does not exist
[ERROR] /home/travis/build/Cognifide/aet/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/ReportConfigurationManager.java:[27,2] error: cannot find symbol
symbol: class ReportConfigurationManagerConf
location: class ReportConfigurationManager
[ERROR] /home/travis/build/Cognifide/aet/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/ReportConfigurationManager.java:[30,23] error: cannot find symbol
symbol: class ReportConfigurationManagerConf
location: class ReportConfigurationManager
[ERROR] /home/travis/build/Cognifide/aet/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/ReportConfigurationManager.java:[24,17] error: cannot find symbol
symbol: class ReportConfigurationManagerConf
|
My bad, I forgot add files to git repository ;) |
malaskowski
reviewed
Aug 9, 2018
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Service | ||
| @Component(label = "MetadataServlet", description = "Returns Suite Metadata", immediate = true) | ||
| @Component(service = BasicDataServlet.class, immediate = true) |
There was a problem hiding this comment.
Could you check if service = HttpServlet.class would be enough here and in other BasicDataServlet extensions please? We only want this class to be registered as a servlet. It won't be referenced anywhere.
test-executor/pom.xml
Outdated
| @@ -123,6 +123,7 @@ | |||
|
|
|||
| <build> | |||
| <plugins> | |||
| <!-- ToDo: remove me when all felix dependencies are removed --> | |||
There was a problem hiding this comment.
Please clear also dependencies:
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
</dependency>
and
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
There was a problem hiding this comment.
I edited wrong file, now should be correct
PiteroS678
force-pushed
the
update-osgi-annotations-rest-endpoint
branch
3 times, most recently
from
baffb38
to
5374660
Compare
plutasnyy
force-pushed
the
update-osgi-annotations-rest-endpoint
branch
from
5374660
to
34d8e54
Compare
…tations-rest-endpoint
malaskowski
approved these changes
Aug 10, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I updated osgi annotations in rest endpoint
Motivation and Context
Before, annotations was marked as deprecated
Screenshots (if appropriate):
Types of changes
Checklist:
I hereby agree to the terms of the AET Contributor License Agreement.