Skip to content

Commit 5e9f82a

Browse files
Release/0.5.0 alpha.3
* Update release version to 0.5.0-alpha.3 * Configure gradle to build against Java 11 instead of 17. * Roll back gradle wrapper to Gradle 7.5.1 for corporate user base. * Fix bug in parsing inline scriptlets. * Build out HtmlTagTransformer. * Improve default logging behavior of Transformers. * Remove extraneous 'implements xyz' on subclasses. * Remove unused import statements.
1 parent e94b700 commit 5e9f82a

23 files changed

+217
-80
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

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

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/uiDesigner.xml

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

buildSrc/settings.gradle

Lines changed: 0 additions & 7 deletions
This file was deleted.

buildSrc/src/main/groovy/com.rombalabs.strutstospringtoolkit.java-common-conventions.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id 'java'
88
}
99

10-
version = '0.5.0-alpha.2'
10+
version = '0.5.0-alpha.3'
1111

1212
repositories {
1313
// Use Maven Central for resolving dependencies.
@@ -30,12 +30,16 @@ dependencies {
3030
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3131
}
3232

33-
tasks.withType(JavaCompile).configureEach {
34-
options.compilerArgs += ["-Xlint:all"]
33+
java {
34+
toolchain {
35+
languageVersion = JavaLanguageVersion.of(11)
36+
}
3537
}
3638

37-
tasks.named('compileJava', JavaCompile) {
39+
tasks.withType(JavaCompile).configureEach {
40+
options.compilerArgs += ["-Xlint:all"]
3841
options.javaModuleVersion = provider { version }
42+
options.release = 11
3943
}
4044

4145
tasks.named('test', Test) {
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
75
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

jspServices/src/main/java/com/rombalabs/strutstospringtoolkit/jspservices/PreProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
import com.rombalabs.strutstospringtoolkit.jspservices.transformers.PreprocessTransformer;
44
import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.AttributeInlineLogicTagTransformer;
5+
import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.HtmlTagTransformer;
56
import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.InlineBeanWriteTagTransformer;
67
import com.rombalabs.strutstospringtoolkit.jspservices.transformers.preprocessing.InlineScriptletTransformer;
78
import org.apache.commons.io.FileUtils;
89
import org.apache.logging.log4j.LogManager;
910
import org.apache.logging.log4j.Logger;
1011

1112
import java.io.*;
12-
import java.nio.file.CopyOption;
13-
import java.nio.file.StandardCopyOption;
1413
import java.util.ArrayList;
1514
import java.util.List;
1615

@@ -24,6 +23,7 @@ public PreProcessor() {
2423
transformers = new ArrayList<>();
2524

2625
// struts:bean transformers
26+
transformers.add(new HtmlTagTransformer());
2727
transformers.add(new InlineScriptletTransformer());
2828
transformers.add(new AttributeInlineLogicTagTransformer());
2929
transformers.add(new InlineBeanWriteTagTransformer());

0 commit comments

Comments
 (0)