Permalink
Browse files

Merge branch 'appng-1.16.x'

  • Loading branch information...
appng-buildmaster committed Jun 14, 2018
2 parents 0e39aac + 053e268 commit c314faa5fa5742b0a1783efe7531f9f8ccc486b5
Showing with 215 additions and 79 deletions.
  1. +2 −9 README.adoc
  2. +1 −1 appng-api/pom.xml
  3. +1 −1 appng-application-assembly/pom.xml
  4. +15 −15 appng-application-bom/pom.xml
  5. +2 −2 appng-application-camunda/README.adoc
  6. +1 −1 appng-application-camunda/pom.xml
  7. +1 −1 appng-application-parent/pom.xml
  8. +2 −2 appng-application/README.adoc
  9. +1 −1 appng-application/pom.xml
  10. +1 −1 appng-appngizer-jaxb/pom.xml
  11. +1 −1 appng-appngizer-maven-plugin/pom.xml
  12. +1 −1 appng-appngizer/pom.xml
  13. +1 −1 appng-archetype-application/pom.xml
  14. +1 −1 appng-archetype-application/readme.txt
  15. +1 −1 appng-archetype-application/src/main/resources/archetype-resources/pom.xml
  16. +1 −1 appng-camunda/pom.xml
  17. +1 −1 appng-cli/pom.xml
  18. +1 −1 appng-core/pom.xml
  19. +70 −16 appng-core/src/main/java/org/appng/core/controller/filter/PageCacheFilter.java
  20. +89 −0 appng-core/src/test/java/org/appng/core/controller/filter/PageCacheFilterTest.java
  21. +1 −1 appng-documentation/pom.xml
  22. +4 −4 appng-documentation/src/main/asciidoc/listing/dependencies.txt
  23. +1 −1 appng-forms/pom.xml
  24. +1 −1 appng-formtags/pom.xml
  25. +1 −1 appng-mail/pom.xml
  26. +1 −1 appng-persistence/pom.xml
  27. +1 −1 appng-search/pom.xml
  28. +1 −1 appng-standalone/pom.xml
  29. +1 −1 appng-taglib/pom.xml
  30. +1 −1 appng-template-assembly/pom.xml
  31. +2 −2 appng-template-parent/pom.xml
  32. +1 −1 appng-testsupport/pom.xml
  33. +1 −1 appng-tomcat7/pom.xml
  34. +1 −1 appng-tomcat8/pom.xml
  35. +1 −1 appng-tools/pom.xml
  36. +1 −1 appng-xmlapi/pom.xml
  37. +1 −1 pom.xml
@@ -1,14 +1,7 @@
image::https://www.aiticon.com/assets/images/appng_logo_760px.jpg[]
:snapshot: 1.18.0-SNAPSHOT
:stable: 1.17.1
:snapshot: 1.16.3-SNAPSHOT
:stable: 1.16.1
:current: {stable}
ifdef::env-github[]
:caution-caption: :fire:
:important-caption: :exclamation:
:note-caption: :paperclip:
:tip-caption: :bulb:
:warning-caption: :warning:
endif::[]
[caption="Apache License 2.0",link=LICENSE]
image::https://img.shields.io/badge/License-Apache%202-blue.svg?style=flat-square[]
@@ -11,7 +11,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -8,7 +8,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -5,7 +5,7 @@
<artifactId>appng-application-bom</artifactId>
<packaging>pom</packaging>
<name>appNG application BOM</name>
<version>1.17.1</version>
<version>1.16.3</version>
<description>the bill of materials for an appNG application, defining all provided dependencies</description>
<organization>
<name>aiticon GmbH</name>
@@ -826,85 +826,85 @@
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-api</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-camunda</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-cli</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-core</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-forms</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-formtags</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-mail</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-persistence</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-search</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-taglib</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-tomcat7</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-tomcat8</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-tools</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-xmlapi</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -1,6 +1,6 @@
image::https://www.aiticon.com/assets/images/appng_logo_760px.jpg[]
:snapshot: 1.18.0-SNAPSHOT
:stable: 1.17.1
:snapshot: 1.16.3-SNAPSHOT
:stable: 1.16.1
:current: {stable}
Welcome to appNG, the **N**ext **G**eneration **app**lication platform!
@@ -10,7 +10,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.appng</groupId>
<artifactId>appng-application-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<packaging>pom</packaging>
<name>appNG application parent</name>
<description>Parent pom for appNG applications</description>
@@ -1,6 +1,6 @@
image::https://www.aiticon.com/assets/images/appng_logo_760px.jpg[]
:snapshot: 1.18.0-SNAPSHOT
:stable: 1.17.1
:snapshot: 1.16.3-SNAPSHOT
:stable: 1.16.1
:current: {stable}
Welcome to appNG, the **N**ext **G**eneration **app**lication platform!
@@ -10,7 +10,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -9,7 +9,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -9,7 +9,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -8,6 +8,6 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
</parent>
</project>
@@ -1,2 +1,2 @@
Usage:
mvn archetype:generate -DgroupId=mygroupid -DartifactId=myartifactid -DarchetypeGroupId=org.appng -DarchetypeArtifactId=appng-archetype-application -DarchetypeVersion=1.17.1 -DinteractiveMode=false
mvn archetype:generate -DgroupId=mygroupid -DartifactId=myartifactid -DarchetypeGroupId=org.appng -DarchetypeArtifactId=appng-archetype-application -DarchetypeVersion=1.16.3 -DinteractiveMode=false
@@ -9,7 +9,7 @@
<properties>
<outFolder>target</outFolder>
<appNGVersion>1.17.1</appNGVersion>
<appNGVersion>1.16.3</appNGVersion>
<displayName>myapplication</displayName>
<longDescription>enter long description here</longDescription>
<timestamp>${maven.build.timestamp}</timestamp>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.17.1</version>
<version>1.16.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Oops, something went wrong.

0 comments on commit c314faa

Please sign in to comment.