Skip to content

Commit 8d5a43d

Browse files
committed
update pom versions
Signed-off-by: Terence Parr <[email protected]>
1 parent fc59296 commit 8d5a43d

File tree

3 files changed

+65
-68
lines changed

3 files changed

+65
-68
lines changed

antlr3-maven-plugin/pom.xml

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,18 @@
6666
</parent>
6767

6868
<name>ANTLR 3 Maven plugin</name>
69-
<prerequisites>
70-
<maven>2.0</maven>
71-
</prerequisites>
69+
70+
<properties>
71+
<mavenVersion>3.8.4</mavenVersion>
72+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
73+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
74+
</properties>
7275

7376
<!--
7477
Where does our actual project live on the interwebs.
7578
-->
7679
<url>http://antlr.org</url>
7780

78-
<properties>
79-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
80-
</properties>
81-
8281
<description>
8382

8483
This is the brand new, re-written from scratch plugin for ANTLR v3.
@@ -162,20 +161,40 @@ Jim Idle - March 2009
162161
<dependency>
163162
<groupId>org.apache.maven</groupId>
164163
<artifactId>maven-plugin-api</artifactId>
165-
<version>2.0</version>
164+
<version>3.8.4</version>
166165
<scope>compile</scope>
167166
</dependency>
168167

168+
<dependency>
169+
<groupId>org.apache.maven.plugin-tools</groupId>
170+
<artifactId>maven-plugin-annotations</artifactId>
171+
<version>3.6.2</version>
172+
<scope>provided</scope>
173+
</dependency>
174+
175+
<dependency>
176+
<groupId>org.apache.maven</groupId>
177+
<artifactId>maven-core</artifactId>
178+
<version>${mavenVersion}</version>
179+
<scope>provided</scope>
180+
</dependency>
169181
<dependency>
170182
<groupId>org.apache.maven</groupId>
171-
<artifactId>maven-project</artifactId>
172-
<version>2.0</version>
183+
<artifactId>maven-compat</artifactId>
184+
<version>${mavenVersion}</version>
185+
<scope>test</scope>
186+
</dependency>
187+
<dependency>
188+
<groupId>org.codehaus.plexus</groupId>
189+
<artifactId>plexus-utils</artifactId>
190+
<version>3.4.1</version>
191+
<scope>provided</scope>
173192
</dependency>
174193

175194
<dependency>
176195
<groupId>org.codehaus.plexus</groupId>
177196
<artifactId>plexus-compiler-api</artifactId>
178-
<version>2.0</version>
197+
<version>2.9.0</version>
179198
</dependency>
180199

181200
<!--
@@ -215,26 +234,16 @@ Jim Idle - March 2009
215234
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
216235
</configuration>
217236
</plugin>
218-
219237
</plugins>
220238

221239
</build>
222240

223241
<reporting>
224242
<plugins>
225-
<plugin>
226-
<groupId>org.apache.maven.plugins</groupId>
227-
<artifactId>maven-javadoc-plugin</artifactId>
228-
<version>3.3.1</version>
229-
<configuration>
230-
<failOnError>false</failOnError>
231-
<quiet>true</quiet>
232-
</configuration>
233-
</plugin>
234243
<plugin>
235244
<groupId>org.apache.maven.plugins</groupId>
236245
<artifactId>maven-plugin-plugin</artifactId>
237-
<version>3.2</version>
246+
<version>3.6.2</version>
238247
</plugin>
239248
</plugins>
240249
</reporting>

antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
5656
* Parses ANTLR grammar files {@code *.g} and transforms them into Java source
5757
* files.
5858
*
59-
* @goal antlr
60-
* @phase generate-sources
61-
* @requiresDependencyResolution compile
62-
* @requiresProject true
59+
* goal antlr
60+
* phase generate-sources
61+
* requiresDependencyResolution compile
62+
* requiresProject true
6363
*
6464
* @author <a href="mailto:[email protected]">Jim Idle</a>
6565
*/
@@ -74,52 +74,52 @@ public class Antlr3Mojo
7474
* it will report various statistics about the parser, such as information
7575
* on cyclic DFAs, which rules may use backtracking, and so on.
7676
*
77-
* @parameter default-value="false"
77+
* default-value="false"
7878
*/
7979
protected boolean report;
8080
/**
8181
* If set to true, then the ANTLR tool will print a version of the input
8282
* grammar(s) which are stripped of any embedded actions.
8383
*
84-
* @parameter default-value="false"
84+
* default-value="false"
8585
*/
8686
protected boolean printGrammar;
8787
/**
8888
* If set to true, then the code generated by the ANTLR code generator will
8989
* be set to debug mode. This means that when run, the code will 'hang' and
9090
* wait for a debug connection on a TCP port (49100 by default).
9191
*
92-
* @parameter default-value="false"
92+
* default-value="false"
9393
*/
9494
protected boolean debug;
9595
/**
9696
* If set to true, then the generated parser will compute and report profile
9797
* information at runtime.
9898
*
99-
* @parameter default-value="false"
99+
* default-value="false"
100100
*/
101101
protected boolean profile;
102102
/**
103103
* If set to true, then the ANTLR tool will generate a description of the
104104
* NFA for each rule in <a href="http://www.graphviz.org">Dot format</a>
105105
*
106-
* @parameter default-value="false"
106+
* default-value="false"
107107
*/
108108
protected boolean nfa;
109109
/**
110110
* If set to true, then the ANTLR tool will generate a description of the
111111
* DFA for each decision in the grammar in
112112
* <a href="http://www.graphviz.org">Dot format</a>.
113113
*
114-
* @parameter default-value="false"
114+
* default-value="false"
115115
*/
116116
protected boolean dfa;
117117
/**
118118
* If set to true, the generated parser code will log rule entry and exit
119119
* points to stdout ({@link System#out} for the Java target) as an aid to
120120
* debugging.
121121
*
122-
* @parameter default-value="false"
122+
* default-value="false"
123123
*/
124124
protected boolean trace;
125125
/**
@@ -128,23 +128,23 @@ public class Antlr3Mojo
128128
* ANTLR supports the built-in formats {@code antlr}, {@code gnu} and
129129
* {@code vs2005}.
130130
*
131-
* @parameter default-value="antlr"
131+
* default-value="antlr"
132132
*/
133133
protected String messageFormat;
134134
/**
135135
* If set to true, then ANTLR will report verbose messages during the code
136136
* generation process. This includes the names of files, the version of
137137
* ANTLR, and more.
138138
*
139-
* @parameter default-value="true"
139+
* default-value="true"
140140
*/
141141
protected boolean verbose;
142142

143143
/**
144144
* The maximum number of alternatives allowed in an inline switch statement.
145145
* Beyond this, ANTLR will not generate a switch statement for the DFA.
146146
*
147-
* @parameter default-value="300"
147+
* default-value="300"
148148
*/
149149
private int maxSwitchCaseLabels;
150150

@@ -153,7 +153,7 @@ public class Antlr3Mojo
153153
* statement. For decisions with fewer alternatives, an if/else if/else
154154
* statement will be used instead.
155155
*
156-
* @parameter default-value="3"
156+
* default-value="3"
157157
*/
158158
private int minSwitchAlts;
159159

@@ -171,30 +171,26 @@ public class Antlr3Mojo
171171
* A set of Ant-like inclusion patterns used to select files from the source
172172
* directory for processing. By default, the pattern <code>**&#47;*.g</code>
173173
* is used to select grammar files.</p>
174-
*
175-
* @parameter
176174
*/
177175
protected Set<String> includes = new HashSet<String>();
178176
/**
179177
* A set of Ant-like exclusion patterns used to prevent certain files from
180178
* being processed. By default, this set is empty such that no files are
181179
* excluded.
182-
*
183-
* @parameter
184180
*/
185181
protected Set<String> excludes = new HashSet<String>();
186182
/**
187183
* The current Maven project.
188184
*
189-
* @parameter expression="${project}"
190-
* @required
191-
* @readonly
185+
* expression="${project}"
186+
* required
187+
* readonly
192188
*/
193189
protected MavenProject project;
194190
/**
195191
* The directory where the ANTLR grammar files ({@code *.g}) are located.
196192
*
197-
* @parameter default-value="${basedir}/src/main/antlr3"
193+
* default-value="${basedir}/src/main/antlr3"
198194
*/
199195
private File sourceDirectory;
200196
/**
@@ -203,7 +199,7 @@ public class Antlr3Mojo
203199
* such that the generated files will participate in later build phases like
204200
* compiling and packaging.
205201
*
206-
* @parameter default-value="${project.build.directory}/generated-sources/antlr3"
202+
* default-value="${project.build.directory}/generated-sources/antlr3"
207203
* @required
208204
*/
209205
private File outputDirectory;
@@ -212,7 +208,7 @@ public class Antlr3Mojo
212208
* grammars. Note that ANTLR will not try to process grammars that it finds
213209
* to be imported into other grammars (in the same processing session).
214210
*
215-
* @parameter default-value="${basedir}/src/main/antlr3/imports"
211+
* default-value="${basedir}/src/main/antlr3/imports"
216212
*/
217213
private File libDirectory;
218214

@@ -398,14 +394,6 @@ public void execute()
398394

399395
}
400396

401-
402-
/**
403-
*
404-
* @param sourceDirectory
405-
* @param outputDirectory
406-
* @throws IOException
407-
* @throws InclusionScanException
408-
*/
409397
private void processGrammarFiles(File sourceDirectory, File outputDirectory)
410398
throws IOException, InclusionScanException {
411399
// Which files under the source set should we be looking for as grammar files

gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
/**
4141
* Takes gUnit scripts and directly performs testing.
4242
*
43-
* @goal gunit
43+
* goal gunit
4444
*
45-
* @phase test
46-
* @requiresDependencyResolution test
47-
* @requiresProject true
45+
* phase test
46+
* requiresDependencyResolution test
47+
* requiresProject true
4848
*
4949
* @author Steve Ebersole
5050
*/
@@ -56,26 +56,26 @@ public class GUnitExecuteMojo extends AbstractMojo {
5656
/**
5757
* INTERNAL : The Maven Project to which we are attached
5858
*
59-
* @parameter expression="${project}"
60-
* @required
59+
* expression="${project}"
60+
* required
6161
*/
6262
private MavenProject project;
6363

6464
/**
6565
* INTERNAL : The artifacts associated to the dependencies defined as part
6666
* of our configuration within the project to which we are being attached.
6767
*
68-
* @parameter expression="${plugin.artifacts}"
69-
* @required
68+
* expression="${plugin.artifacts}"
69+
* required
7070
* @readonly
7171
*/
7272
private List<Artifact> pluginArtifacts;
7373

7474
/**
7575
* Specifies the directory containing the gUnit testing files.
7676
*
77-
* @parameter expression="${basedir}/src/test/gunit"
78-
* @required
77+
* expression="${basedir}/src/test/gunit"
78+
* required
7979
*/
8080
private File sourceDirectory;
8181

@@ -97,8 +97,8 @@ public class GUnitExecuteMojo extends AbstractMojo {
9797
/**
9898
* Specifies directory to which gUnit reports should get written.
9999
*
100-
* @parameter expression="${basedir}/target/gunit-report"
101-
* @required
100+
* expression="${basedir}/target/gunit-report"
101+
* required
102102
*/
103103
private File reportDirectory;
104104

@@ -107,7 +107,7 @@ public class GUnitExecuteMojo extends AbstractMojo {
107107
* <p>
108108
* By default we skip gUnit tests if the user requested that all testing be skipped using 'maven.test.skip'</p>
109109
*
110-
* @parameter expression="${maven.test.skip}"
110+
* expression="${maven.test.skip}"
111111
*/
112112
private boolean skip;
113113

0 commit comments

Comments
 (0)