-
Notifications
You must be signed in to change notification settings - Fork 94
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
[MJAVADOC-544] - Changed behaviour of Javadoc for temporary files encoding (options, argfile, ...) #10
Conversation
42c3c3b
to
3f1abf5
Compare
Due to changes to readFile in b78042e conflicts were introduced. I rebased the PR and fixed some style-issues in the tests. |
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.
Can you squash the commits? And you can add yourself as contributor in the root pom.
@@ -4368,9 +4378,15 @@ private void addCommandLineOptions( Commandline cmd, List<String> arguments, Fil | |||
options.append( StringUtils.join( arguments.iterator(), | |||
SystemUtils.LINE_SEPARATOR ) ); | |||
|
|||
/* default to platform encoding */ | |||
String encoding = null; | |||
if ( JAVA_VERSION.compareTo( SINCE_JAVADOC_9 ) >= 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.
Please switch to isAtLeast()
or isBefore()
, which are better readable.
@@ -4414,9 +4430,15 @@ private void addCommandLineArgFile( Commandline cmd, File javadocOutputDirectory | |||
cmd.createArg().setValue( "@" + FILES_FILE_NAME ); | |||
} | |||
|
|||
/* default to platform encoding */ | |||
String encoding = null; | |||
if ( JAVA_VERSION.compareTo( SINCE_JAVADOC_9 ) >= 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.
Please switch to isAtLeast()
or isBefore()
, which are better readable.
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.
Don't forget to squash your commits
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.
I addressed your points and squashed the commits.
Ran mvn -Prun-its verify with JDK8 and JDK9 on Windows successfully.
3f1abf5
to
45473e3
Compare
45473e3
to
5a6489a
Compare
too bad... The error message occurs when compiling the file "/src/test/resources/unit/argfileumlautencoding-test/argfileumlautencoding/test/Appäöü�.java". I tried to reproduce the problem: The build passes when I execute the maven build in a docker container (image: maven:3-jdk-9-slim) in which the LANG is set to C.UTF-8.
I tried to convert the file itself and the corresponding .xml-file to ISO-8859-1, but that did not go well either. At the moment I'm out of ideas and I don't think that I can find a working solution for this (besides setting the LANG to ...UTF-8 in the build environment). My initial problem was only related to the options file, which would be fixed with this pull request. So, for this issue, I have removed the special handling for argfile, which would only be needed if someone is using special characters in java class names. Is this course of action okay? |
mvn -Prun-its verify was run with JDK9 on windows without errors