Skip to content

Commit 36d288c

Browse files
manticore-projectsmanticore-projects
committed
build: use customized, highly optimized JavaCC artifacts for 8.1.1
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent 850fb70 commit 36d288c

6 files changed

Lines changed: 42 additions & 118 deletions

File tree

‎build.gradle‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,7 @@ tasks.withType(Checkstyle).configureEach {
131131
}
132132

133133
repositories {
134-
gradlePluginPortal()
135-
mavenLocal()
136134
mavenCentral()
137-
138-
// JavaCC 8 Snapshots
139-
maven {
140-
url = uri('https://central.sonatype.com/repository/maven-snapshots/')
141-
}
142-
143135
maven { url "https://dev.saxonica.com/maven" }
144136
}
145137

@@ -157,13 +149,13 @@ dependencies {
157149
testImplementation 'com.h2database:h2:+'
158150

159151
// for JaCoCo Reports
160-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.4'
161-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
162-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
163-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
152+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.+'
153+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.+'
154+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.+'
155+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5+'
164156

165157
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
166-
testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
158+
testImplementation 'org.mockito:mockito-junit-jupiter:5.+'
167159

168160
// Performance Benchmark
169161
testImplementation 'org.openjdk.jmh:jmh-core:+'
@@ -173,24 +165,13 @@ dependencies {
173165
xmlDoclet ('com.manticore-projects.tools:xml-doclet:+'){ changing = true }
174166

175167
// enforce latest version of JavaCC
176-
testImplementation('org.javacc:core:8.1.1-SNAPSHOT') { changing = true }
177-
testImplementation('org.javacc.generator:java:8.1.1-SNAPSHOT') { changing = true }
178-
179-
jmh 'org.openjdk.jmh:jmh-core:1.37'
180-
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
181-
javacc('org.javacc:core:8.1.1-SNAPSHOT') { changing = true }
182-
javacc('org.javacc.generator:java:8.1.1-SNAPSHOT') { changing = true }
183-
}
184-
configurations.configureEach {
185-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
186-
if (details.requested.group in ['org.javacc:core', 'org.javacc.generator']) {
187-
// Check for updates every build
188-
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
189-
}
190-
}
168+
testImplementation('com.manticore-projects.jsqlformatter:javacc-core:+')
169+
testImplementation('com.manticore-projects.jsqlformatter:javacc-java:+')
191170

192-
resolutionStrategy.force 'org.javacc:core:8.1.1-SNAPSHOT',
193-
'org.javacc.generator:java:8.1.1-SNAPSHOT'
171+
jmh 'org.openjdk.jmh:jmh-core:+'
172+
jmh 'org.openjdk.jmh:jmh-generator-annprocess:+'
173+
javacc('com.manticore-projects.jsqlformatter:javacc-core:+')
174+
javacc('com.manticore-projects.jsqlformatter:javacc-java:+')
194175
}
195176

196177
compileJavacc {
@@ -200,7 +181,8 @@ compileJavacc {
200181
java_template_type: 'modern',
201182
// Comment this in to build the parser with tracing.
202183
DEBUG_PARSER: 'false',
203-
DEBUG_LOOKAHEAD: 'false'
184+
DEBUG_LOOKAHEAD: 'false',
185+
LEGACY_EXCEPTION_HANDLING: 'false'
204186
]
205187
}
206188

‎gradle/wrapper/gradle-wrapper.jar‎

-504 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 12 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 12 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,10 @@
2424
</license>
2525
</licenses>
2626

27-
<repositories>
28-
<repository>
29-
<id>javacc8-snapshots</id>
30-
<snapshots>
31-
<enabled>true</enabled>
32-
</snapshots>
33-
<releases><enabled>false</enabled></releases>
34-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
35-
</repository>
36-
<repository>
37-
<id>ossrh-snapshots</id>
38-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
39-
<snapshots><enabled>true</enabled></snapshots>
40-
<releases><enabled>false</enabled></releases>
41-
</repository>
42-
</repositories>
43-
<pluginRepositories>
44-
<pluginRepository>
45-
<id>javacc8-snapshots</id>
46-
<snapshots>
47-
<enabled>true</enabled>
48-
</snapshots>
49-
<releases><enabled>false</enabled></releases>
50-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
51-
</pluginRepository>
52-
<pluginRepository>
53-
<id>ossrh-snapshots</id>
54-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
55-
<snapshots><enabled>true</enabled></snapshots>
56-
<releases><enabled>false</enabled></releases>
57-
</pluginRepository>
58-
</pluginRepositories>
27+
5928

6029
<dependencies>
61-
<!-- needed for parsing the Keywords via JTree in ParserKeywordsUtils -->
62-
<dependency>
63-
<groupId>org.javacc</groupId>
64-
<artifactId>core</artifactId>
65-
<version>8.1.0-SNAPSHOT</version>
66-
<type>pom</type>
67-
<scope>test</scope>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.javacc.generator</groupId>
71-
<artifactId>java</artifactId>
72-
<version>8.1.0-SNAPSHOT</version>
73-
<scope>test</scope>
74-
</dependency>
30+
7531
<dependency>
7632
<groupId>commons-io</groupId>
7733
<artifactId>commons-io</artifactId>
@@ -287,26 +243,26 @@
287243
</goals>
288244
<configuration>
289245
<javaccCmdLineArgs>
290-
<gen>-CODE_GENERATOR="Java"</gen>
291-
<enc>-GRAMMAR_ENCODING="UTF-8"</enc>
246+
<arg>-CODE_GENERATOR:"Java"</arg>
247+
<arg>-GRAMMAR_ENCODING:"UTF-8"</arg>
292248
</javaccCmdLineArgs>
293249
<jjtreeCmdLineArgs>
294-
<enc>-GRAMMAR_ENCODING="UTF-8"</enc>
295-
<gen>-CODE_GENERATOR="Java"</gen>
250+
<arg>-GRAMMAR_ENCODING:"UTF-8"</arg>
251+
<arg>-CODE_GENERATOR:"Java"</arg>
296252
</jjtreeCmdLineArgs>
297253
</configuration>
298254
</execution>
299255
</executions>
300256
<dependencies>
301257
<dependency>
302-
<groupId>org.javacc.generator</groupId>
303-
<artifactId>java</artifactId>
304-
<version>8.1.0-SNAPSHOT</version>
258+
<groupId>com.manticore-projects.jsqlformatter</groupId>
259+
<artifactId>javacc-java</artifactId>
260+
<version>[8.1.1.1939,)</version>
305261
</dependency>
306262
<dependency>
307-
<groupId>org.javacc</groupId>
308-
<artifactId>core</artifactId>
309-
<version>8.1.0-SNAPSHOT</version>
263+
<groupId>com.manticore-projects.jsqlformatter</groupId>
264+
<artifactId>javacc-core</artifactId>
265+
<version>[8.1.1.1939,)</version>
310266
</dependency>
311267
</dependencies>
312268
</plugin>
@@ -345,11 +301,6 @@
345301
<plugin>
346302
<groupId>org.apache.maven.plugins</groupId>
347303
<artifactId>maven-release-plugin</artifactId>
348-
<!--
349-
dont switch to version 3.0.1, that makes the strange certificate problems
350-
start maven release with -Dmaven.wagon.http.ssl.allowall=true since JDK 1.8
351-
does not have a complete truststore
352-
-->
353304
<version>3.1.1</version>
354305
<configuration>
355306
<localCheckout>true</localCheckout>

0 commit comments

Comments
 (0)