Merge branch 'java11' into bootstrap-ui # Conflicts: # app/pom.xml # pom.xml
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/2f60b458 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/2f60b458 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/2f60b458 Branch: refs/heads/bootstrap-ui Commit: 2f60b4580427dacb495ef94df15f8b4562cfc8e2 Parents: 7fc12f4 9e94f5f Author: Dave Johnson <[email protected]> Authored: Sun Oct 21 14:06:15 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Oct 21 14:06:15 2018 -0400 ---------------------------------------------------------------------- app/pom.xml | 46 +++++++++++++++----- .../weblogger/business/WebloggerImpl.java | 9 ++-- .../business/jpa/JPAWebloggerImpl.java | 13 +----- app/src/main/resources/logback.xml | 13 ++++++ app/src/test/resources/roller-custom.properties | 1 + pom.xml | 6 +-- 6 files changed, 60 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/2f60b458/app/pom.xml ---------------------------------------------------------------------- diff --cc app/pom.xml index b490695,bdff10b..7a3abd5 --- a/app/pom.xml +++ b/app/pom.xml @@@ -33,6 -33,14 +33,13 @@@ limitations under the License <packaging>war</packaging> <properties> - + <servlet.version>3.0.1</servlet.version> + <jsp-api.version>2.2</jsp-api.version> + <java-activation.version>1.2.0</java-activation.version> + <java-mail.version>1.4.7</java-mail.version> + <jstl.version>1.2</jstl.version> + + <angular.version>1.2.29</angular.version> <ant.version>1.10.1</ant.version> <commons-validator.version>1.6</commons-validator.version> <commons-beanutils.version>1.9.3</commons-beanutils.version> @@@ -93,8 -97,26 +96,20 @@@ <artifactId>mail</artifactId> <version>${java-mail.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> </dependency> + <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + <version>${java-activation.version}</version> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <!-- Eclipselink JPA is the default JPA implementation used by Roller, comment out this dependency and uncomment Hibernate's to use that stack instead. http://git-wip-us.apache.org/repos/asf/roller/blob/2f60b458/pom.xml ----------------------------------------------------------------------
