jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

updated to Primefaces 7.0, JDK11

Browse Source
This commit is contained in:
Joern Muehlencord
2019-04-02 16:07:21 +02:00
parent 4fd1710503
commit eb332461aa
3 changed files with 139 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
account-ui/pom.xml
View File

@ -1,141 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.1-SNAPSHOT</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-account-ui</artifactId> <artifactId>shared-account-ui</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>shared-account-ui</name> <name>shared-account-ui</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
<applicationUuid>143a2bd3-7e0b-4162-a76e-3031331c7dfe</applicationUuid> <!-- default filter if not selected via profile -->
<maven.compiler.source>10</maven.compiler.source> <filter.name>development</filter.name>
<maven.compiler.target>10</maven.compiler.target> </properties>
<!-- default filter if not selected via profile --> <dependencies>
<filter.name>development</filter.name> <dependency>
</properties> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<dependencies> </dependency>
<dependency> <!-- Admin faces template -->
<groupId>org.primefaces</groupId> <dependency>
<artifactId>primefaces</artifactId> <groupId>com.github.adminfaces</groupId>
</dependency> <artifactId>admin-template</artifactId>
<!-- Admin faces template --> </dependency>
<dependency> <!-- Omnifaces, faces utils -->
<groupId>com.github.adminfaces</groupId> <dependency>
<artifactId>admin-template</artifactId> <groupId>org.omnifaces</groupId>
</dependency> <artifactId>omnifaces</artifactId>
<!-- Omnifaces, faces utils --> </dependency>
<dependency> <!-- Apache Shiro, Security API -->
<groupId>org.omnifaces</groupId> <dependency>
<artifactId>omnifaces</artifactId> <groupId>org.apache.shiro</groupId>
</dependency> <artifactId>shiro-core</artifactId>
<!-- Apache Shiro, Security API --> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId> <artifactId>shiro-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shiro-web</artifactId> <artifactId>shared-shiro-faces</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-shiro-faces</artifactId> <artifactId>shared-account</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-account</artifactId> <artifactId>shared-util</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-util</artifactId> <artifactId>shared-jeeutil</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.sf</groupId>
<artifactId>shared-jeeutil</artifactId> <artifactId>filter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.muehlencord.sf</groupId> <groupId>javax</groupId>
<artifactId>filter</artifactId> <artifactId>javaee-web-api</artifactId>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>javax</groupId> </dependencies>
<artifactId>javaee-web-api</artifactId>
<scope>provided</scope> <build>
</dependency> <filters>
</dependencies> <filter>${basedir}/src/main/filters/${filter.name}.properties</filter>
</filters>
<build>
<filters> <resources>
<filter>${basedir}/src/main/filters/${filter.name}.properties</filter> <!-- fill buildinformation file -->
</filters> <resource>
<directory>src/main/resources</directory>
<resources> <filtering>true</filtering>
<!-- fill buildinformation file --> <includes>
<resource> <include>**/*.properties</include>
<directory>src/main/resources</directory> <include>**/*.xml</include>
<filtering>true</filtering> </includes>
<includes> </resource>
<include>**/*.properties</include> </resources>
<include>**/*.xml</include>
</includes> <finalName>account</finalName>
</resource> <plugins>
</resources> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<finalName>account</finalName> <artifactId>maven-compiler-plugin</artifactId>
<plugins> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <version>3.2.2</version>
<source>10</source> <configuration>
<target>10</target> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> <webResources>
</plugin> <resource>
<plugin> <directory>${basedir}/src/main/webapp</directory>
<groupId>org.apache.maven.plugins</groupId> <filtering>true</filtering>
<artifactId>maven-war-plugin</artifactId> <includes>
<version>3.2.2</version> <include>WEB-INF/web.xml</include>
<configuration> <include>WEB-INF/shiro.ini</include>
<failOnMissingWebXml>false</failOnMissingWebXml> </includes>
<webResources> </resource>
<resource> </webResources>
<directory>${basedir}/src/main/webapp</directory> </configuration>
<filtering>true</filtering> </plugin>
<includes> </plugins>
<include>WEB-INF/web.xml</include> </build>
<include>WEB-INF/shiro.ini</include>
</includes> <profiles>
</resource> <profile>
</webResources> <id>development</id>
</configuration> <properties>
</plugin> <filter.name>development</filter.name>
</plugins> </properties>
</build> </profile>
<profiles> <profile>
<profile> <id>production</id>
<id>development</id> <properties>
<properties> <filter.name>production</filter.name>
<filter.name>development</filter.name> </properties>
</properties> </profile>
</profile> </profiles>
</project>
<profile>
<id>production</id>
<properties>
<filter.name>production</filter.name>
</properties>
</profile>
</profiles>
</project>

4
account-ui/src/main/resources/admin-config.properties
View File

@ -1,5 +1,5 @@
admin.loginPage=/login.xhtml admin.loginPage=login.xhtml
admin.indexPage=/web/index.xhtml admin.indexPage=web/index.xhtml
#admin.dateFormat= #admin.dateFormat=
#admin.breadcrumbSize=5 #admin.breadcrumbSize=5
admin.renderMessages=true admin.renderMessages=true

8
pom.xml
View File

@ -29,8 +29,8 @@
<properties> <properties>
<!-- project setup --> <!-- project setup -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -193,12 +193,12 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>6.2</version> <version>7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.adminfaces</groupId> <groupId>com.github.adminfaces</groupId>
<artifactId>admin-template</artifactId> <artifactId>admin-template</artifactId>
<version>1.0.0-RC20</version> <version>1.0.0-RC21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.omnifaces</groupId> <groupId>org.omnifaces</groupId>