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

Cumulative backport of changes from master through PR 497 #498

Merged
merged 10 commits into from
Feb 7, 2017
Merged

Cumulative backport of changes from master through PR 497 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
332c6f3
[tests] Use UTF-8 in printWriter
hazendaz Jan 29, 2017
771c515
[session] Properly handle setting subject in case of stale session ex…
hazendaz Jan 29, 2017
5a7944d
[ci] Replace iterators with enhanced for loops
hazendaz Jan 29, 2017
d1732d5
[ci] Sonar based cleanup
hazendaz Jan 29, 2017
a5fc614
[pom] Move servlet-api to parent for demos as all use it
hazendaz Jan 29, 2017
f43a559
[ci] Avoid setting new session as session should exist at given point
hazendaz Jan 31, 2017
ceae305
[license] Add third-party license files
hazendaz Feb 7, 2017
1fe0846
[ci] Update copyright dates
hazendaz Feb 7, 2017
865ebdf
[license] Skip re-branding license headers of third parties
hazendaz Feb 7, 2017
1896240
[ci] Added changelog for waffle 1.8.3
hazendaz Feb 7, 2017
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
1.8.3 (2/6/2017)
================
* Documentation updates
* Version Updates
* Sonar / Coverity Cleanup
* Added third party license files to distribution to make it easier for those requiring license certification within our distro.

1.8.2 (12/31/2016)
================
* Lots of documentation updates from the community (many thanks!)
Expand Down
12 changes: 11 additions & 1 deletion Source/JNA/waffle-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -48,6 +48,10 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -73,6 +77,12 @@
<artifactId>waffle-jna</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 1 addition & 11 deletions Source/JNA/waffle-demo/waffle-filter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,22 +36,12 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>com.github.waffle</groupId>
<artifactId>waffle-tomcat6</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
15 changes: 1 addition & 14 deletions Source/JNA/waffle-demo/waffle-form/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,19 +36,6 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.name}</finalName>
</build>
Expand Down
15 changes: 1 addition & 14 deletions Source/JNA/waffle-demo/waffle-jaas/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,19 +36,6 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.name}</finalName>
</build>
Expand Down
15 changes: 1 addition & 14 deletions Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,19 +36,6 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.name}</finalName>
</build>
Expand Down
15 changes: 1 addition & 14 deletions Source/JNA/waffle-demo/waffle-mixed/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,19 +36,6 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.name}</finalName>
</build>
Expand Down
15 changes: 1 addition & 14 deletions Source/JNA/waffle-demo/waffle-negotiate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,19 +36,6 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.name}</finalName>
</build>
Expand Down
12 changes: 1 addition & 11 deletions Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,17 +36,7 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.waffle</groupId>
<artifactId>waffle-spring-security3</artifactId>
Expand Down
12 changes: 1 addition & 11 deletions Source/JNA/waffle-demo/waffle-spring-form/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -36,17 +36,7 @@
<tag>HEAD</tag>
</scm>

<properties>
<servlet.version>3.1.0</servlet.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.waffle</groupId>
<artifactId>waffle-spring-security3</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions Source/JNA/waffle-distro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/*LICENSE-guava.txt</exclude>
<exclude>**/*LICENSE-jna.txt</exclude>
<exclude>**/*LICENSE-logback.txt</exclude>
<exclude>**/*LICENSE-slf4j.txt</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
11 changes: 11 additions & 0 deletions Source/JNA/waffle-distro/src/assembly/LICENSE-guava.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Copyright (C) 2009 The Guava Authors

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the specific language governing permissions and limitations under
the License.
22 changes: 22 additions & 0 deletions Source/JNA/waffle-distro/src/assembly/LICENSE-jna.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Java Native Access project (JNA) is dual-licensed under 2
alternative Open Source/Free licenses: LGPL 2.1 or later and
Apache License 2.0. (starting with JNA version 4.0.0).

You can freely decide which license you want to apply to
the project.

You may obtain a copy of the LGPL License at:

http://www.gnu.org/licenses/licenses.html

A copy is also included in the downloadable source code package
containing JNA, in file "LGPL2.1", under the same directory
as this file.

You may obtain a copy of the Apache License at:

http://www.apache.org/licenses/

A copy is also included in the downloadable source code package
containing JNA, in file "AL2.0", under the same directory
as this file.
15 changes: 15 additions & 0 deletions Source/JNA/waffle-distro/src/assembly/LICENSE-logback.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Logback LICENSE
---------------

Logback: the reliable, generic, fast and flexible logging framework.
Copyright (C) 1999-2015, QOS.ch. All rights reserved.

This program and the accompanying materials are dual-licensed under
either the terms of the Eclipse Public License v1.0 as published by
the Eclipse Foundation

or (per the licensee's choosing)

under the terms of the GNU Lesser General Public License version 2.1
as published by the Free Software Foundation.

24 changes: 24 additions & 0 deletions Source/JNA/waffle-distro/src/assembly/LICENSE-slf4j.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Copyright (c) 2004-2014 QOS.ch
All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.



12 changes: 11 additions & 1 deletion Source/JNA/waffle-distro/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

Copyright (c) 2010-2016 Application Security, Inc.
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
Expand Down Expand Up @@ -46,6 +46,16 @@
</dependencySets>

<fileSets>
<fileSet>
<directory>${project.basedir}/src/assembly</directory>
<outputDirectory></outputDirectory>
<includes>
<include>LICENSE-guava.txt</include>
<include>LICENSE-logback.txt</include>
<include>LICENSE-jna.txt</include>
<include>LICENSE-slf4j.txt</include>
</includes>
</fileSet>
<fileSet>
<directory>../../../</directory>
<outputDirectory>.</outputDirectory>
Expand Down
Loading