Nice manifest writer #6323
Open
Nice manifest writer #6323
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
This writes the manifest file with indention which is easier to read, while still considering the 72 chars limit per line. so technically still a valid manifest. borrowed from https://github.com/apache/felix-dev/blob/master/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestWriter.java#L108 and https://github.com/apache/felix-dev/blob/master/utils/src/main/java/org/apache/felix/utils/manifest/Parser.java#L43 Signed-off-by: Christoph Rueger <[email protected]>
CorruptManifest > testCorruptJar() FAILED
org.opentest4j.AssertionFailedError: expected: <. . > but was: <. .>
at app//org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
at app//org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
at app//org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197)
at app//org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:182)
at app//org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:177)
at app//org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:1142)
at app//test.CorruptManifest.testCorruptJar(CorruptManifest.java:59)
MultiReleaseTest > testBuild() FAILED
org.opentest4j.AssertionFailedError:
expected: ""
but was: "Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9))""
at [email protected]/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at [email protected]/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
at [email protected]/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at [email protected]/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
at app//test.MultiReleaseTest.testBuild(MultiReleaseTest.java:96)
Signed-off-by: Christoph Rueger <[email protected]>
check null
Signed-off-by: Christoph Rueger <[email protected]>
Signed-off-by: Christoph Rueger <[email protected]>
that way 'nice' could be disabled by callers. Signed-off-by: Christoph Rueger <[email protected]>
|
hmm. I'd like to suggest to do it differently. In Analyzer::calcManifest we have the data in Parameters. Why not add an append method that takes a nice option? This will create an attribute in the manifest with newlines. Which is as far as I know allowed ... (might have to check this). ManifestUtil::write then needs to account for newlines in the attribute value. it should then reset the limit and output an EOL. it should not put the newline itself in the manifest output. The advantage is that:
|
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.
Closes #6321
Felix Bundle plugin has a niceManifest option that formats Manifest
We adapted this and use it as the new default.