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
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,14 @@ do
8080
esac
8181
done
8282

83-
# This is normally unused
84-
# shellcheck disable=SC2034
85-
APP_BASE_NAME=${0##*/}
8683
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8784

85+
APP_NAME="Gradle"
86+
APP_BASE_NAME=${0##*/}
87+
88+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90+
8891
# Use the maximum available, or set MAX_FD != -1 to use that value.
8992
MAX_FD=maximum
9093

@@ -130,29 +133,22 @@ location of your Java installation."
130133
fi
131134
else
132135
JAVACMD=java
133-
if ! command -v java >/dev/null 2>&1
134-
then
135-
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136137
137138
Please set the JAVA_HOME variable in your environment to match the
138139
location of your Java installation."
139-
fi
140140
fi
141141

142142
# Increase the maximum file descriptors if we can.
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146-
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148146
MAX_FD=$( ulimit -H -n ) ||
149147
warn "Could not query maximum file descriptor limit"
150148
esac
151149
case $MAX_FD in #(
152150
'' | soft) :;; #(
153151
*)
154-
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156152
ulimit -n "$MAX_FD" ||
157153
warn "Could not set maximum file descriptor limit to $MAX_FD"
158154
esac
@@ -197,10 +193,6 @@ if "$cygwin" || "$msys" ; then
197193
done
198194
fi
199195

200-
201-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203-
204196
# Collect all arguments for the java command;
205197
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206198
# shell script including quotes and variable substitutions, so put them in

gradlew.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29-
@rem This is normally unused
3029
set APP_BASE_NAME=%~n0
3130
set APP_HOME=%DIRNAME%
3231

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)