-
Notifications
You must be signed in to change notification settings - Fork 3
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
Strictly name the org.json module for JLink and JPackage #4
base: master
Are you sure you want to change the base?
Changes from all commits
eb16f22
401e4b1
5ea59dd
079e369
fd57ae4
793809b
e4d9aac
7356193
c54e16e
1c85fe1
b14459a
a99329b
6f63406
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
.idea | ||
**/*.idea | ||
src/main | ||
*.iml |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -97,7 +97,19 @@ | |
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<!-- Allow finding fixed moditect version --> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you please extend this comment in a way that it somehow says when the snapshot repository can be removed again? Something like: "Remove this when we have an official moditect release containing bugfix X". Or "Remove this when modditect version x is released"? |
||
<repositories> | ||
<repository> | ||
<id>sonatype-nexus-snapshots</id> | ||
<name>Sonatype Nexus Snapshots</name> | ||
<url>https://oss.sonatype.org/content/repositories/snapshots</url> | ||
<releases><enabled>false</enabled></releases> | ||
<snapshots><enabled>true</enabled></snapshots> | ||
</repository> | ||
</repositories> | ||
|
||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.felix</groupId> | ||
|
@@ -113,14 +125,45 @@ | |
</instructions> | ||
</configuration> | ||
</plugin> | ||
<!-- Force Maven to run under 1.8, The compiler is set to 1.6, and 1.7 to build the output --> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-enforcer-plugin</artifactId> | ||
<version>3.0.0-M2</version> | ||
<executions> | ||
<execution> | ||
<id>enforce-java</id> | ||
<goals> | ||
<goal>enforce</goal> | ||
</goals> | ||
<configuration> | ||
<rules> | ||
<requireJavaVersion> | ||
<version>1.8.0</version> | ||
</requireJavaVersion> | ||
</rules> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<version>2.3.2</version> | ||
<version>3.8.1</version> | ||
<configuration> | ||
<source>%%JAVAVERSION%%</source> | ||
<target>%%JAVAVERSION%%</target> | ||
<!--<source>1.6</source> | ||
<target>1.6</target>--> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With this, target is now defined twice There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ahh, no, sorry, it's a block comment... Could you remove the commented out code here? |
||
<!--<release>1.11</release>--> | ||
</configuration> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.ow2.asm</groupId> | ||
<artifactId>asm</artifactId> | ||
<version>7.0</version> | ||
</dependency> | ||
</dependencies> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you add a comment to the pom why this new dependency is needed here? |
||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
|
@@ -147,10 +190,22 @@ | |
</goals> | ||
<configuration> | ||
<additionalparam>-Xdoclint:none</additionalparam> | ||
<failOnError>false</failOnError> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.sonatype.plugins</groupId> | ||
<artifactId>nexus-staging-maven-plugin</artifactId> | ||
<version>1.6.3</version> | ||
<extensions>true</extensions> | ||
<configuration> | ||
<serverId>ossrh</serverId> | ||
<nexusUrl>https://oss.sonatype.org/</nexusUrl> | ||
<autoReleaseAfterClose>false</autoReleaseAfterClose> | ||
</configuration> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-gpg-plugin</artifactId> | ||
|
@@ -165,17 +220,6 @@ | |
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.sonatype.plugins</groupId> | ||
<artifactId>nexus-staging-maven-plugin</artifactId> | ||
<version>1.6.3</version> | ||
<extensions>true</extensions> | ||
<configuration> | ||
<serverId>ossrh</serverId> | ||
<nexusUrl>https://oss.sonatype.org/</nexusUrl> | ||
<autoReleaseAfterClose>false</autoReleaseAfterClose> | ||
</configuration> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-jar-plugin</artifactId> | ||
|
@@ -187,6 +231,31 @@ | |
</archive> | ||
</configuration> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.moditect</groupId> | ||
<artifactId>moditect-maven-plugin</artifactId> | ||
<version>1.0.0.Beta2</version> | ||
<executions> | ||
<execution> | ||
<id>add-module-infos</id> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>add-module-info</goal> | ||
</goals> | ||
<configuration> | ||
<!-- Put module-info.class in META-INF/versions/9 to maximize backwards compat --> | ||
<!-- See: https://github.com/moditect/moditect/issues/67 --> | ||
<jvmVersion>9</jvmVersion> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will this automatically be available for Java 10, 11 and 12 then? |
||
<overwriteExistingFiles>true</overwriteExistingFiles> | ||
<module> | ||
<moduleInfoFile> | ||
src/moditect/module-info.java | ||
</moduleInfoFile> | ||
</module> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
module org.json { | ||
exports org.json; | ||
} |
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.
What about these 4 lines? Are they neccessary, not neccessary or optional? Or are there conditions when they should be enabled?