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

Jump to bottom

Fixes #15741: Update scala to 2.12.10 #2468

Merged
merged 1 commit into from
Sep 18, 2019
Merged

Fixes #15741: Update scala to 2.12.10 #2468

merged 1 commit into from
Sep 18, 2019

Conversation

fanf
Copy link
Member

@fanf fanf commented Sep 17, 2019

ncharles
ncharles reviewed Sep 17, 2019
View reviewed changes
webapp/sources/rudder-parent-pom/pom.xml
@@ -433,6 +435,16 @@ limitations under the License.
<artifactId>scala-reflect</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_${scala-binary-version}</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

why do we need it now ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm really not sure, and actually even if I had a good explanation for that one, I don't understand why it needs to be declared in rudder-web since it is a compile dep in rudder-core. But it seems that they changed the scope of that module in scala-compiler from compile to provided, and so we don't get it through liftweb-json (I think).

ncharles
ncharles approved these changes Sep 18, 2019
View reviewed changes
Copy link
Member

@ncharles ncharles left a comment

Choose a reason for hiding this comment

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

this works ok !

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/2468
-- Your faithful QA
Kant merge: "Morality is not the doctrine of how we may make ourselves happy, but how we may make ourselves worthy of happiness."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/14982/console)

@fanf
Copy link
Member Author

fanf commented Sep 18, 2019

OK, merging this PR

@fanf fanf merged commit be080cb into Normation:branches/rudder/5.0 Sep 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncharles ncharles ncharles approved these changes

Assignees
No one assigned
Labels
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@fanf @Normation-Quality-Assistant @ncharles