Skip to content

Commit fc59296

Browse files
committed
Revert "[maven-release-plugin] rollback the release of 3.5.3"
This reverts commit 808964c.
1 parent 808964c commit fc59296

File tree

6 files changed

+59
-10
lines changed

6 files changed

+59
-10
lines changed

antlr-complete/pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,21 @@
123123
</executions>
124124
</plugin>
125125

126-
<plugin>
126+
<plugin> <!-- create javadoc jar -->
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-javadoc-plugin</artifactId>
129+
<version>3.3.1</version>
129130
<configuration>
130-
<includeDependencySources>true</includeDependencySources>
131+
<javadocVersion>1.8</javadocVersion>
132+
<failOnError>false</failOnError>
131133
</configuration>
134+
<executions>
135+
<execution>
136+
<goals>
137+
<goal>javadoc</goal>
138+
</goals>
139+
</execution>
140+
</executions>
132141
</plugin>
133142
</plugins>
134143

antlr3-maven-archetype/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
</extensions>
3636

3737
<plugins>
38-
38+
<!--
3939
<plugin>
4040
<artifactId>maven-archetype-plugin</artifactId>
4141
<version>2.2</version>
4242
<extensions>true</extensions>
4343
</plugin>
44+
-->
4445

4546
</plugins>
4647

antlr3-maven-plugin/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ Jim Idle - March 2009
201201
<build>
202202

203203
<plugins>
204-
205204
<plugin>
206205
<groupId>org.apache.maven.plugins</groupId>
207206
<artifactId>maven-site-plugin</artifactId>
@@ -223,6 +222,15 @@ Jim Idle - March 2009
223222

224223
<reporting>
225224
<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>
226234
<plugin>
227235
<groupId>org.apache.maven.plugins</groupId>
228236
<artifactId>maven-plugin-plugin</artifactId>

gunit-maven-plugin/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,15 @@
126126
<build>
127127

128128
<plugins>
129+
<plugin> <!-- create javadoc jar -->
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-javadoc-plugin</artifactId>
132+
<version>3.3.1</version>
133+
<configuration>
134+
<javadocVersion>1.8</javadocVersion>
135+
<failOnError>false</failOnError>
136+
</configuration>
137+
</plugin>
129138

130139
<plugin>
131140
<groupId>org.apache.maven.plugins</groupId>

pom.xml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,16 @@
142142
</modules>
143143
<build>
144144
<plugins>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-compiler-plugin</artifactId>
148+
<version>3.8.1</version>
149+
<configuration>
150+
<source>${jdk}</source>
151+
<target>${jdk}</target>
152+
</configuration>
153+
</plugin>
154+
<!--
145155
<plugin>
146156
<groupId>org.apache.maven.plugins</groupId>
147157
<artifactId>maven-compiler-plugin</artifactId>
@@ -174,6 +184,7 @@
174184
</execution>
175185
</executions>
176186
</plugin>
187+
-->
177188
</plugins>
178189
</build>
179190
</profile>
@@ -256,14 +267,21 @@
256267
<version>2.2.1</version>
257268
</plugin>
258269

259-
<plugin>
270+
<plugin> <!-- create javadoc jar -->
260271
<groupId>org.apache.maven.plugins</groupId>
261272
<artifactId>maven-javadoc-plugin</artifactId>
262-
<!-- override the version inherited from the parent -->
263-
<version>2.9.1</version>
273+
<version>3.3.1</version>
264274
<configuration>
265-
<quiet>true</quiet>
275+
<javadocVersion>1.8</javadocVersion>
276+
<failOnError>false</failOnError>
266277
</configuration>
278+
<executions>
279+
<execution>
280+
<goals>
281+
<goal>javadoc</goal>
282+
</goals>
283+
</execution>
284+
</executions>
267285
</plugin>
268286

269287
<plugin>
@@ -302,7 +320,11 @@
302320
<plugin>
303321
<groupId>org.apache.maven.plugins</groupId>
304322
<artifactId>maven-javadoc-plugin</artifactId>
305-
<version>2.9.1</version>
323+
<version>3.3.1</version>
324+
<configuration>
325+
<javadocVersion>1.8</javadocVersion>
326+
<failOnError>false</failOnError>
327+
</configuration>
306328
</plugin>
307329
</plugins>
308330
</reporting>

tool/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>org.antlr</groupId>
6969
<artifactId>antlr3-maven-plugin</artifactId>
70-
<version>3.5</version>
70+
<version>3.5.2</version>
7171
<configuration>
7272
<libDirectory>target/generated-sources/antlr/org/antlr/grammar/v3</libDirectory>
7373
</configuration>

0 commit comments

Comments
 (0)