Merge remote-tracking branch 'origin/master' into FREEMARKER-200
diff --git a/.travis.yml b/.travis.yml
old mode 100644
new mode 100755
index ab9907e..457664d
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,8 @@
language: java
jdk:
- openjdk8
- - openjdk9
- - openjdk10
- openjdk11
- - openjdk12
- - openjdk13
- - openjdk14
+ - openjdk17
script:
- mvn clean install
- cd ./freemarker-generator-cli/target/appassembler/
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
index 7762c41..8abbf3b 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
@@ -98,9 +98,9 @@
}
/**
- * Returns <tt>true</tt> if this list contains no elements.
+ * Returns <code>true</code> if this list contains no elements.
*
- * @return <tt>true</tt> if this list contains no elements
+ * @return <code>true</code> if this list contains no elements
*/
public boolean isEmpty() {
return dataSources.isEmpty();
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
index 7d84af5..f79efd6 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
@@ -83,7 +83,7 @@
/**
* Resolve a <code>source</code> to a <code>DataSource</code>.
*
- * @param source the source being a file name, an URI or <code>NamedUri</code>
+ * @param source the source being a file name, URI or <code>NamedUri</code>
* @return list of <code>DataSource</code>
*/
protected List<DataSource> get(String source) {
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
old mode 100644
new mode 100755
index 05497dc..57ca79d
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -206,6 +206,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
</dependency>
+ <!-- XPath support -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.2.0</version>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
diff --git a/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx b/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
index 2c2486f..9ffa27a 100644
--- a/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
+++ b/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
@@ -8,7 +8,7 @@
ssl_certificate /etc/nginx/ssl/wildcard.company.org-public.crt;
ssl_certificate_key /etc/nginx/ssl/wildcard.company.org-private.rsa;
- include /etc/nginx/includes/FLKPMM.nginx;
+ include /etc/nginx/fastcgi.conf;
proxy_buffers 16 64k;
proxy_buffer_size 128k;
@@ -18,13 +18,10 @@
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
- proxy_set_header X-TPP-QWAC $ssl_client_cert;
ssl_verify_client optional_no_ca;
-
location / {
return 403;
}
-
}
diff --git a/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx b/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
index b618991..b8d1e70 100644
--- a/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
+++ b/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
@@ -12,7 +12,7 @@
proxy_buffer_size 128k;
location / {
- proxy_pass https://osroutercpssl/;
+ proxy_pass http://127.0.0.1:8080;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
@@ -21,7 +21,6 @@
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
}
-
}
diff --git a/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl b/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
index 79331a5..29b08a7 100644
--- a/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
+++ b/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
@@ -12,7 +12,7 @@
</#compress>
<#--------------------------------------------------------------------------->
<#function splunkSearchUrl accessLog>
- <#return "https://splunk.p.santanderconsumer.at/en-US/app/scbdevteam/search?q=search%20source%3D%22${accessLog?url}%22">
+ <#return "https://server.invalid/en-US/app/name/search?q=search%20source%3D%22${accessLog?url}%22">
</#function>
<#--------------------------------------------------------------------------->
<#function getAccessLog text>
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
index 2e9d04b..f82dab5 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
@@ -159,7 +159,7 @@
/**
* Resolve a <code>source</code> to a list of <code>TemplateTransformation</code>.
*
- * @param source the source being a file name, an URI or <code>NamedUri</code>
+ * @param source the source being a file name, URI or <code>NamedUri</code>
* @param output Optional output file or directory
* @return list of <code>TemplateTransformation</code>
*/
diff --git a/freemarker-generator-maven-plugin/pom.xml b/freemarker-generator-maven-plugin/pom.xml
index c8b014a..d7d640f 100644
--- a/freemarker-generator-maven-plugin/pom.xml
+++ b/freemarker-generator-maven-plugin/pom.xml
@@ -35,7 +35,7 @@
<maven-core.version>3.6.3</maven-core.version>
<maven-plugin-api.version>3.6.3</maven-plugin-api.version>
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
- <gson.version>2.8.6</gson.version>
+ <gson.version>2.8.9</gson.version>
<mockito.version>3.7.7</mockito.version>
<assertj-core.version>3.18.1</assertj-core.version>
</properties>
diff --git a/freemarker-generator-tools/pom.xml b/freemarker-generator-tools/pom.xml
index 04ca3f1..7c39bea 100644
--- a/freemarker-generator-tools/pom.xml
+++ b/freemarker-generator-tools/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.7</version>
+ <version>2.8.9</version>
</dependency>
<!-- Java Faker -->
<dependency>
@@ -121,13 +121,13 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.14.2</version>
+ <version>1.15.3</version>
</dependency>
<!-- SnakeYamlTool -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.28</version>
+ <version>2.0</version>
</dependency>
<!-- UtahPrserTool -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 5a0c552..067ea8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
