From 1db5ab0559e0f42f19b3ca08e189cf2fdea81c6b Mon Sep 17 00:00:00 2001 From: Peter Jakubco Date: Thu, 21 Dec 2023 12:05:44 +0100 Subject: [PATCH] [#18] Added Automatic-Module-Name to jars --- cup-maven-plugin/pom.xml | 29 +++-- .../com/github/vbmacher/cup/GoalGenerate.java | 111 ++++++------------ java-cup-runtime/java-cup-11b-runtime.jar | Bin 30960 -> 31041 bytes java-cup-runtime/pom.xml | 8 +- java-cup/java-cup-11b.jar | Bin 122080 -> 122151 bytes java-cup/pom.xml | 10 +- 6 files changed, 61 insertions(+), 97 deletions(-) diff --git a/cup-maven-plugin/pom.xml b/cup-maven-plugin/pom.xml index 701f585..f4326ff 100644 --- a/cup-maven-plugin/pom.xml +++ b/cup-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.github.vbmacher cup-maven-plugin maven-plugin - 11b-20160615-2 + 11b-20160615-3 Java CUP Maven Plugin Maven plug-in for executing Java CUP library @@ -101,7 +101,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -119,7 +119,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh @@ -137,14 +137,14 @@ org.apache.maven.wagon wagon-http - 3.5.2 + 3.5.3 org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.12.0 ${compiler.source} ${compiler.target} @@ -154,21 +154,30 @@ + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.10.2 + provided + org.apache.maven maven-plugin-api - 3.8.6 + 3.9.6 + provided org.apache.maven maven-artifact jar - 3.8.5 + 3.9.6 + provided org.apache.maven - maven-project - 2.2.1 + maven-core + 3.9.6 + provided @@ -181,7 +190,7 @@ com.github.vbmacher java-cup - 11b-20160615-2 + 11b-20160615-3 diff --git a/cup-maven-plugin/src/main/java/com/github/vbmacher/cup/GoalGenerate.java b/cup-maven-plugin/src/main/java/com/github/vbmacher/cup/GoalGenerate.java index e54b734..7e8877c 100644 --- a/cup-maven-plugin/src/main/java/com/github/vbmacher/cup/GoalGenerate.java +++ b/cup-maven-plugin/src/main/java/com/github/vbmacher/cup/GoalGenerate.java @@ -21,6 +21,9 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import java.io.File; @@ -29,21 +32,17 @@ /** * Goal which generates java files from cup files. - * - * @goal generate - * @requiresProject true - * @phase generate-sources */ +@SuppressWarnings("unused") +@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES) public class GoalGenerate extends AbstractMojo implements CupParameters { public static final String DEFAULT_CUP_DIR = "src/main/cup"; /** * A flag whether to output the symbol constant code as an interface rather * than as a class. - * - * @parameter default-value="true" - * @editable */ + @Parameter(defaultValue = "true") private boolean symbolsInterface; /** @@ -51,189 +50,145 @@ public class GoalGenerate extends AbstractMojo implements CupParameters { *

* By default, a `parser.cup` file in src/main/cup will be * processed. - * - * @parameter - * @editable */ + @Parameter private File cupDefinition; /** * Parser class name. - * - * @parameter default-value="parser" - * @editable */ + @Parameter(defaultValue = "parser") private String className; /** * Symbol class name. - * - * @parameter default-value="sym" - * @editable */ + @Parameter(defaultValue = "sym") private String symbolsName; /** * Name of the directory into which cup should generate the parser. - * - * @parameter property="${project.build.directory}/generated-sources/cup" - * @editable */ + @Parameter(defaultValue = "${project.build.directory}/generated-sources/cup") private File outputDirectory; /** - * @parameter property="project" - * @required + * Maven project */ + @Parameter(property = "project", readonly = true, required = true) private MavenProject project; /** * Package name. - * - * @parameter - * @editable */ + @Parameter private String packageName; /** - * Produce a human readable dump of the symbols and grammar. - * - * @parameter default-value="false" - * @editable + * Produce a human-readable dump of the symbols and grammar. */ + @Parameter(defaultValue = "false") private boolean dumpGrammar; /** * Produce a dump of parse state machine - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean dumpStates; /** * Produce a dump of the parse tables - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean dumpTables; /** * Print time usage summary - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean time; /** * Print messages to indicate progress of the system - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean progress; /** * Don't refer to java_cup.runtime.Scanner - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean noScanner; /** * Don't propagate the left and right token position values - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean noPositions; /** * Don't print the usual summary of parse states, etc. - * - * @parameter default-value="true" - * @editable */ + @Parameter(defaultValue = "true") private boolean noSummary; /** * Don't warn about useless productions, etc. - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean noWarn; /** * Compact tables by defaulting to most frequent reduce - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean compactRed; /** * Number of conflicts expected/allowed - * - * @parameter default-value="0" - * @editable */ + @Parameter(defaultValue = "0") private int expectedConflicts; /** - * Put non terminals in symbol constant class - * - * @parameter default-value="false" - * @editable + * Put non-terminals in symbol constant class */ + @Parameter(defaultValue = "false") private boolean nontermsToSymbols; /** * Specify type arguments for parser class - * - * @parameter - * @editable */ + @Parameter private String typeArgs; /** * The granularity in milliseconds of the last modification date for testing * whether a source needs regeneration. - * - * @parameter property="lastModGranularityMs" - * @editable */ + @Parameter(property = "lastModGranularityMs") private int staleMillis; /** * Makes CUP generate xleft/xright handles for accessing Location objects for symbol start/end inside actions. - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean locations; /** * Makes CUP generate generic actions that produce XMLElement-objects for any symbol, that is labeled by the CUP spec author. - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean xmlActions; /** * This option goes one step further then `` by producing the full parse tree as XMLElement-tree. - * - * @parameter default-value="false" - * @editable */ + @Parameter(defaultValue = "false") private boolean genericLabels; /** - * Executer the "generate" goal. + * Executes the "generate" goal. * * @throws MojoExecutionException if any error occurs during parser generation */ diff --git a/java-cup-runtime/java-cup-11b-runtime.jar b/java-cup-runtime/java-cup-11b-runtime.jar index 6f02157dbb3c456fffaa67fb08d621acf52b2a36..953f96dfbda08d0150c90355df6c873340d4245c 100644 GIT binary patch delta 653 zcmezHk@4Us#tHiMA`A>191NC`Q^Rjw++;a{fq`Ka5Q{L#F!;KLIO=-(x#{~l`gyv! z28ZbRx`l>tGBCg8Yf0S&#HAJ742&!C$rgm14Qce8;=%Xf!=&d16;JRDr^Ub$KJ zI%?j>sZk~qXN14FbpPIUzgWI^yC3H@7~C&7|Eno;espri6yvZivp*BdnCsn-_8h)7 zCFl#M;^QT|uWyf+tX?~JT}Nt3>o$|16CrzIGjkH_0%Xr|{%Km(pV`f6q%Z%oy(s2p zh3%0}u`B8k8w2?(nm%rsdBpj1SCGd?#*G(F=Bvsvd(4Pzpj6mEld0&B~L}&;r z#BXT+n#@-yBftq(3?c*=-a2wJPG&ANWinu#ypc_KvTvalQ#^>NF*%D-c(PcLz~m!^ zQcUOAfI?(F>`LqxZSb4j!01wQ9C5@Ye!ICS5 zg(jyJYcX0*o>=U~bV3p+C_4Foq~PRypasGuQcTySfI^Cs14`@}%O+1KNnl()`C~~W z({=@*u)^e=QUj(UWgt^_^6pY=rc@OulWVeknGMq^4Jem$a&wsh(_1Yt_pKK9%ONNpD^d>cZaeZ-y$p(y4o0S>Y=i7-e<9033!CbV*~sBv|sNq~PQOKntEqAxqAa0!qqG7Lb+%>pWH>#b`VEVMzj0o;+A0 zq12kGP65pPpuh=MbGcNC$x<08q&``!%#cY(1<14n%iPdFHhQ84P(p3;l`;dSEm~j` zl*>(-<`_->Xru{N{=^Jf`CK!ggxq8SbHT~?%C(rL*nznk6&8%TlM^fan2vi--dN$o Xq?rRWN_etRr7Bkg2LnS?0m!2Op7Og{ diff --git a/java-cup-runtime/pom.xml b/java-cup-runtime/pom.xml index 9035d79..3626585 100644 --- a/java-cup-runtime/pom.xml +++ b/java-cup-runtime/pom.xml @@ -6,7 +6,7 @@ com.github.vbmacher java-cup-runtime - 11b-20160615-2 + 11b-20160615-3 jar Java CUP Runtime Maven Package @@ -54,7 +54,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -72,7 +72,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh @@ -99,7 +99,7 @@ org.apache.maven.wagon wagon-http - 3.5.2 + 3.5.3 diff --git a/java-cup/java-cup-11b.jar b/java-cup/java-cup-11b.jar index f065a728e7657f8428323c6601dcdd80a26ff4d7..084743370604c950b10c7f20f055e9a2850a1a91 100644 GIT binary patch delta 1148 zcmZ`&ZA@Eb6u!?}Sck~hT0Vk+Gm%0W@*(Rsr;NemLZPj|3RUd*aB+&prTf90jT;{d z=;m;-vg2?unyG9*TtugfmIz^qQ3|D$mCqVGam!|8ac;^cllfk5jG57!oHzHJ=bY!9 z`@H7{zEJjjsXUa~q!xsgD}|OvyDWE~J8|)2K@cu*Qws@#vCy1Q@JDLl`4Gi# zHv4mnM@-%R%`q>W(zM@hO-0w$16Sjw(%WWA%jfFe>$YtR z)%~D)J0qhb?AId)2cyr-#iFRr5ccai333Sd36&-US4JXO%f{Bf590Qs}dT^Lm}K8(#Q&PG2CL&Q4D z9)XeVYNT=(XK;*QJ%-3Nf_xVK3Wd9o2O^UjCCqb*0&b}3q#Ietr0?C(Lr>aKPI8TG zqbNlO^^KyKRm?l`<`XH`k4Vb#Af6>H&?6qsPD(Kx#4 zK@Ll~B{@dqQ_~m>EJI1n5_WzJI;^F;yePoyRO5xndb6q4i)eCsIkcayc%f(Ct*81) zs19%8V{RYECT7U}Cs3D*2)XU0ao$$g@;4Mu2hQ?gQbk1GDcz0qyx*c1mvPdISWZY| z6?!S6Cf8Z4V_7A#6YIl6?6g60qUjkQ)-th7c8bdoB{NU>5RXc_;zK>VW|q)IS~By` zdUb+dPI8qT$*kh}sS|t>wdJ-+bQU=w&w>zoew-&1PIAIusBRLEvAJpqO`(NqtRk(C zqbaqwl^54a2^tcokj0*@m$|y8pkrGb=$>gLQB4Cv<<7y=oY+jOr%}yH8)dY68XMS; zcF9Sk%XX}w>$ALza)yhzuT`Q`(Y{u$?Q-)<9!7v{Gq5P4dO){6M1rjP?-KF^Ma}Y+ zDx&gPew9=7<}8Z%zWHY%D*F3CAN6rr_~xW3ng>BU2YK;wx5Iv3{3-SNk$lIlRf6#D Ikn{)r1>WkHp8x;= delta 1099 zcmZ`%Z%k8H6o0?o0SX&Fp`)d1LmjS}g8xusaRO;sYrz)5fxz5E78AwI2{HA<_Q6z5 z+z>Xh7j{_C53)wLWSJq;AnI85fdwsnErmj9F|+K$+#+LH7H|`{-Ii|b!}eZo?*0AF zIlptyx##kYlzaUt9UD%j3c|8wg1gaYD|FdbTo43dkS`@)4okIZU0H>7gTqu&X0^Oj zz20GUwD+c;+NiY58y=s1Z~LvV;f(N1LFR>5ZnM{)cbWI^%T#@Jx96NkC-?XFSq|lV zlX5-#mlMuT|DKk;H%s;$Gqzb*e|T`saamKK9@fcMzHG4Df}NVyuAYhPPeMCYug#73 zSAVo%Zn-X|f3ebA9w}D`3Jy&V)t?(TZT@(^v+L(~?}~k+>7(9?Xlvub8e8hspIm`~ zSKH2a7{7bKq)KQ`m!hu}IDflX$^O4KUS9ljyYl${UzO4u9%#ko2|qy)g&EWD0yTQD z6|0CmC{|R0TB?vqKYFlMaT3xU zx@dozLOzI+p;>(L?=)`L565Ve7gj~e@z|b8ZC(^A%ucD@sgK34MK@*0Fe$!0OEoe| zaF{w}l;a}ZlVMQ^0~D2^lo|$7>0yM6*A9tkOX3=8_HpgOs3cD7sXKPR`#xw;N6ZhK zB6mi5b4Eu;{Je(QIcfX6p4P=g4*&LVkvxjVoKHWJKEjKMURmXQS7 zp9DSK=N9&7avZ5BKfrBCX`re!WKmm~r)~{E!wzUcpJ}04yv+!waEcxTunYUhIEpg% z`8JTQ6b8~8p`?LPE~+a^Q12IE1?k854MxmlA44tIagU*n<(7d~*6{WnC`U4>gV@M; zlm4MHs5!`W-m%9iCG`feg{k;^@)#v81n~khRK<~=ULHpY8?26_E#x2PadR~Zn{EQz zSaNL~<$O9?;_+ z VRqjekj-@Z+e|?4^wA=wle*w0Jaf|=} diff --git a/java-cup/pom.xml b/java-cup/pom.xml index 939162f..f35ee40 100644 --- a/java-cup/pom.xml +++ b/java-cup/pom.xml @@ -6,11 +6,11 @@ com.github.vbmacher java-cup - 11b-20160615-2 + 11b-20160615-3 jar Java CUP Maven Package - Repackaged java-cup-11.jar + Repackaged java-cup-11b.jar https://github.com/vbmacher/cup-maven-plugin @@ -54,7 +54,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -72,7 +72,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh @@ -99,7 +99,7 @@ org.apache.maven.wagon wagon-http - 3.5.2 + 3.5.3