Skip to content

Commit

Permalink
2021.5.361
Browse files Browse the repository at this point in the history
  • Loading branch information
BuildTools committed Aug 2, 2021
1 parent dd59491 commit 7d2b135
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 119 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.terefang.template</groupId>
<artifactId>template</artifactId>
<version>2021.5.360</version>
<version>2021.5.361</version>
<modules>
<module>template-cli</module>
<module>template-maven-plugin</module>
Expand Down
67 changes: 3 additions & 64 deletions template-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>template</artifactId>
<groupId>com.github.terefang.template</groupId>
<version>2021.5.360</version>
<version>2021.5.361</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -106,67 +106,6 @@
<version>RELEASE</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.kohsuke/github-api -->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.131</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-annotation</artifactId>
<version>1.21</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp-urlconnection</artifactId>
<version>2.7.5</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.4.1</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-urlconnection</artifactId>
<version>3.12.3</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.2</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -212,7 +151,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.19</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Expand All @@ -231,7 +170,7 @@
<target>
<mkdir dir="${project.build.directory}/bin"/>

<concat destfile="${project.build.directory}/bin/${project.artifactId}-${project.version}.sh.bin"
<concat destfile="${project.build.directory}/bin/${project.artifactId}-${project.version}.bin"
binary="true">
<fileset file="${project.basedir}/src/main/dist/stub.sh"/>
<fileset
Expand Down
56 changes: 3 additions & 53 deletions template-cli/src/main/dist/stub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@
MYSELF=`which "$0" 2>/dev/null`
[ $? -gt 0 -a -f "$0" ] && MYSELF="./$0"
MYDIR=$(dirname $MYSELF)
MYEXE=$(basename $MYSELF)

if test "x$1" = "x-install"; then
shift
IDIR=$(cd $MYDIR && pwd)
for e in jexl jxlt ecma gsimple jinjava freemarker thymeleaf trimou; do
for m in std template; do
cd $IDIR && ln -s ./$MYEXE $e-$m-proc
done
done
cd $IDIR && ln -s ./$MYEXE preprocessor-proc
cd $IDIR && ln -s ./$MYEXE script-proc
exit 0;
fi

if test "x$1" = "x-java-term" -o "x$1" = "x-JT"; then
shift
Expand Down Expand Up @@ -57,43 +43,7 @@ if test "x$1" = "x"; then
exit 1
fi

if test "x$MYEXE" = "xjexl-std-proc"; then
EXEARGS=" -T JEXL -M STANDARD "
elif test "x$MYEXE" = "xjexl-template-proc"; then
EXEARGS=" -T JEXL -M TEMPLATE "
elif test "x$MYEXE" = "xjxlt-std-proc"; then
EXEARGS=" -T JXLT -M STANDARD "
elif test "x$MYEXE" = "xjxlt-template-proc"; then
EXEARGS=" -T JXLT -M TEMPLATE "
elif test "x$MYEXE" = "xecma-std-proc"; then
EXEARGS=" -T ECMA -M STANDARD "
elif test "x$MYEXE" = "xecma-template-proc"; then
EXEARGS=" -T ECMA -M TEMPLATE "
elif test "x$MYEXE" = "xgsimple-std-proc"; then
EXEARGS=" -T GROOVY -M STANDARD "
elif test "x$MYEXE" = "xgsimple-template-proc"; then
EXEARGS=" -T GROOVY -M TEMPLATE "
elif test "x$MYEXE" = "xjinjava-std-proc"; then
EXEARGS=" -T JINJAVA -M STANDARD "
elif test "x$MYEXE" = "xjinjava-template-proc"; then
EXEARGS=" -T JINJAVA -M TEMPLATE "
elif test "x$MYEXE" = "xfreemarker-std-proc"; then
EXEARGS=" -T FREEMARKER -M STANDARD "
elif test "x$MYEXE" = "xfreemarker-template-proc"; then
EXEARGS=" -T FREEMARKER -M TEMPLATE "
elif test "x$MYEXE" = "xthymeleaf-std-proc"; then
EXEARGS=" -T THYMELEAF -M STANDARD "
elif test "x$MYEXE" = "xthymeleaf-template-proc"; then
EXEARGS=" -T THYMELEAF -M TEMPLATE "
elif test "x$MYEXE" = "xtrimou-std-proc"; then
EXEARGS=" -T TRIMOU -M STANDARD "
elif test "x$MYEXE" = "xtrimou-template-proc"; then
EXEARGS=" -T TRIMOU -M TEMPLATE "
elif test "x$MYEXE" = "xpreprocessor-proc"; then
EXEARGS=" -T PREPROCESSOR -M STANDARD "
elif test "x$MYEXE" = "xscript-proc"; then
EXEARGS=" -T SCRIPT -M SCRIPT "
fi
exec "$java" $_JAVA_OPTS -jar $MYSELF "$@"
exit 1

exec "$java" $_JAVA_OPTS -jar $MYSELF $EXEARGS "$@"
exit 1
#
105 changes: 105 additions & 0 deletions template-cli/src/main/dist/stub.sh.old
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#!/bin/sh
MYSELF=`which "$0" 2>/dev/null`
[ $? -gt 0 -a -f "$0" ] && MYSELF="./$0"
MYDIR=$(dirname $MYSELF)
MYEXE=$(basename $MYSELF)

if test "x$1" = "x-install"; then
shift
IDIR=$(cd $MYDIR && pwd)
for e in jexl jxlt ecma gsimple jinjava freemarker thymeleaf trimou; do
for m in std template; do
cd $IDIR && ln -s ./$MYEXE $e-$m-proc
done
done
cd $IDIR && ln -s ./$MYEXE preprocessor-proc
cd $IDIR && ln -s ./$MYEXE script-proc
exit 0;
fi

if test "x$1" = "x-java-term" -o "x$1" = "x-JT"; then
shift
export TERM="$1"
shift
fi

if test "x$1" = "x-java-home" -o "x$1" = "x-JH"; then
shift
export JAVA_HOME="$1"
shift
fi

if test "x$1" = "x-java-opts" -o "x$1" = "x-JO"; then
shift
export _JAVA_OPTS="$1"
shift
fi

if test ! -n "$JAVA_HOME"; then
if test -d "$MYDIR/java"; then
export JAVA_HOME="$MYDIR/java"
elif test -d "$MYDIR/jre"; then
export JAVA_HOME="$MYDIR/jre"
elif test -d "$MYDIR/../java"; then
export JAVA_HOME="$MYDIR/../java"
elif test -d "$MYDIR/../jre"; then
export JAVA_HOME="$MYDIR/../jre"
fi
fi

java=java
if test -n "$JAVA_HOME"; then
java="$JAVA_HOME/bin/java"
fi

if test "x$1" = "x"; then
exec "$java" -jar $MYSELF
exit 1
fi

if test "x$MYEXE" = "xjexl-std-proc"; then
EXEARGS=" -T JEXL -M STANDARD "
elif test "x$MYEXE" = "xjexl-template-proc"; then
EXEARGS=" -T JEXL -M TEMPLATE "
elif test "x$MYEXE" = "xjxlt-std-proc"; then
EXEARGS=" -T JXLT -M STANDARD "
elif test "x$MYEXE" = "xjxlt-template-proc"; then
EXEARGS=" -T JXLT -M TEMPLATE "
elif test "x$MYEXE" = "xecma-std-proc"; then
EXEARGS=" -T ECMA -M STANDARD "
elif test "x$MYEXE" = "xecma-template-proc"; then
EXEARGS=" -T ECMA -M TEMPLATE "
elif test "x$MYEXE" = "xgsimple-std-proc"; then
EXEARGS=" -T GROOVY -M STANDARD "
elif test "x$MYEXE" = "xgsimple-template-proc"; then
EXEARGS=" -T GROOVY -M TEMPLATE "
elif test "x$MYEXE" = "xjinjava-std-proc"; then
EXEARGS=" -T JINJAVA -M STANDARD "
elif test "x$MYEXE" = "xjinjava-template-proc"; then
EXEARGS=" -T JINJAVA -M TEMPLATE "
elif test "x$MYEXE" = "xfreemarker-std-proc"; then
EXEARGS=" -T FREEMARKER -M STANDARD "
elif test "x$MYEXE" = "xfreemarker-template-proc"; then
EXEARGS=" -T FREEMARKER -M TEMPLATE "
elif test "x$MYEXE" = "xthymeleaf-std-proc"; then
EXEARGS=" -T THYMELEAF -M STANDARD "
elif test "x$MYEXE" = "xthymeleaf-template-proc"; then
EXEARGS=" -T THYMELEAF -M TEMPLATE "
elif test "x$MYEXE" = "xtrimou-std-proc"; then
EXEARGS=" -T TRIMOU -M STANDARD "
elif test "x$MYEXE" = "xtrimou-template-proc"; then
EXEARGS=" -T TRIMOU -M TEMPLATE "
elif test "x$MYEXE" = "xpreprocessor-proc"; then
EXEARGS=" -T PREPROCESSOR -M STANDARD "
elif test "x$MYEXE" = "xscript-proc"; then
EXEARGS=" -T SCRIPT -M SCRIPT "
fi

exec "$java" $_JAVA_OPTS -jar $MYSELF $EXEARGS "$@"
exit 1
#
#
#
#
#
#
2 changes: 1 addition & 1 deletion template-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>template</artifactId>
<groupId>com.github.terefang.template</groupId>
<version>2021.5.360</version>
<version>2021.5.361</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit 7d2b135

Please sign in to comment.