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.

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

JAVA 8 and new Karaf #204

Merged
merged 50 commits into from
Jan 17, 2018
Merged

JAVA 8 and new Karaf #204

merged 50 commits into from
Jan 17, 2018

Conversation

wiiitek
Copy link
Contributor

@wiiitek wiiitek commented Jan 17, 2018


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

wiiitek and others added 30 commits January 3, 2018 14:51
# Conflicts (resolved):
#	core/validation/src/main/java/com/cognifide/aet/validation/impl/ValidationResultBuilderFactoryImpl.java
<feature dependency="true" prerequisite="true">aet-jackson</feature>
<feature dependency="true" prerequisite="true">aet-dependencies</feature>

<bundle>file:./../aet_bundles/current/com.cognifide.aet.communication-api-2.1.4-SNAPSHOT.jar</bundle>
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we somehow have the {aet-version} variable used here?

Copy link
Contributor Author

@wiiitek wiiitek Jan 17, 2018

Choose a reason for hiding this comment

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

This will be done with another pull request: #205

log4j2.logger.worker4.name = com.cognifide.aet.proxy
log4j2.logger.worker4.level = DEBUG
log4j2.logger.worker4.additivity = false
log4j2.logger.worker4.appenderRef.Worker.ref = Worker

# migration tool logger
Copy link
Contributor

Choose a reason for hiding this comment

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

Migration tool logger can be removed. It was supported only in 2.0.0.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the comment! I will remove it.

wiiitek and others added 8 commits January 17, 2018 10:21
* ZGCQ-9547 | maven pom changed

* ZGCQ-9547 | removed unnecessary changes

* ZGCQ-9547 | webdriver fixed

* ZGCQ-9547 | remove redundant aet-features.xml

* ZGCQ-9457 | aet-features.xml restored

* ZGCQ-9457 | removed aet-features.xml

* ZGCQ-9547 | gitignore

* ZGCQ-9547 | remove redundant comment
@wiiitek wiiitek merged commit 8d200cc into master Jan 17, 2018
@wiiitek wiiitek deleted the new-karaf branch January 17, 2018 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants