Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[module] Add initial support for Spring 5 using spring security 4 still #558

Merged
merged 1 commit into from
Oct 1, 2017
Merged

[module] Add initial support for Spring 5 using spring security 4 still #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Version Updates
* Sonar / Coverity Cleanup
* Spring boot support
* Spring / Spring Security 5 support

* Breaking changes
* Requires Java 8+
Expand All @@ -21,6 +22,7 @@
* [#491](https://github.com/Waffle/waffle/pull/491): Rewrite guava Files.write to java 7 FilesWrite #304[@hazendaz](https://github.com/hazendaz).
* [#498](https://github.com/Waffle/waffle/pull/498): Add third party license files[@hazendaz](https://github.com/hazendaz).
* [#553](https://github.com/Waffle/waffle/pull/553): Add spring boot starter and demo[@mgoldgeier](https://github.com/mgoldgeier).
* [#557](https://github.com/Waffle/waffle/pull/558): Add initial support for spring 5 using spring security 4 still[@hazendaz](https://github.com/hazendaz).

1.8.3 (2/6/2017)
================
Expand Down
1 change: 1 addition & 0 deletions Source/JNA/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
<module>waffle-jna</module>
<module>waffle-shiro</module>
<module>waffle-spring-security4</module>
<module>waffle-spring-security5</module>
<module>waffle-spring-boot</module>
<module>waffle-tests</module>
<module>waffle-tomcat7</module>
Expand Down
18 changes: 18 additions & 0 deletions Source/JNA/waffle-spring-security5/format.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Waffle (https://github.com/Waffle/waffle)

Copyright (c) 2010-2017 Application Security, Inc.

All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
Public License v1.0 which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-v10.html.

Contributors: Application Security, Inc.

-->
<!DOCTYPE Format>
<Format>
<!-- Dummy format file -->
</Format>
119 changes: 119 additions & 0 deletions Source/JNA/waffle-spring-security5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Waffle (https://github.com/Waffle/waffle)

Copyright (c) 2010-2017 Application Security, Inc.

All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
Public License v1.0 which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-v10.html.

Contributors: Application Security, Inc.

-->
<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>

<parent>
<groupId>com.github.waffle</groupId>
<artifactId>waffle-parent</artifactId>
<version>1.9.0-SNAPSHOT</version>
</parent>

<artifactId>waffle-spring-security5</artifactId>
<version>1.9.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>waffle-spring-security5</name>
<description>Spring Security 5 integration for WAFFLE</description>
<url>https://waffle.github.com/waffle/</url>

<scm>
<connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
<developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
<url>https://github.com/Waffle/waffle</url>
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>4.0.0</servlet.version>
<spring.version>5.0.0.RELEASE</spring.version>
<spring.security.version>4.2.3.RELEASE</spring.security.version> <!-- TODO: Bump to 5.0.0 once released -->
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>waffle-jna</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>waffle-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring.security.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring.security.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring.security.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Loading