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

1.7.x #536

Closed
wants to merge 100 commits into from
Closed

1.7.x #536

wants to merge 100 commits into from

Conversation

PankajSharma02-Nagarro
Copy link

No description provided.

cubasuarez and others added 30 commits May 12, 2015 20:25
@cubasuarez @hazendaz
Support service provider authorization
5fe175d 
Add possibility for service provider to add authorization by overriding setAuthentication
@cubasuarez @hazendaz
Implementation to Authorize in SP
45432e8 
A NegotiateSecurityFilter that supports dependency injection to authorize principal at serviceprovider after
authenticating in AD.
@hazendaz
Added notes about future support and updated download link.
a3b5473
@hazendaz
updated release date in release notes.
228ab00
@hazendaz
Update spring 3 and 4.
fe7ad88
@hazendaz
Exclude commons logging
7b66791 
We use slf4j - these were missed.
@hazendaz
Pom updates
7ed45ad 
Set jacoco minimum coverage back to zero as it breaks site build.
Update assertj and mockito.
Exclude hamcrest from mockito so it doesn't pick up wrong version.
Add new plugin owasp to check for vulnerabilities
@hazendaz
Added support for Spring security 3 and 4
9ecdaf0
@hazendaz
Updated changelog and referenced issue
0803b78
@hazendaz
first draft of documentation
b9cf447
@hazendaz
[WIP] - documentation
c983f1b
@hazendaz
[WIP] - documentation
d73ec87
@hazendaz
Update dependencies and owasp report
f853951 
slf4j to 1.7.10
jstl to 1.2.4
maven-project-info-reports-plugin to 2.8
JavaEWAH to 1.0.0
jgit to 3.6.1.201501031845-r
sonar-maven-plugin to 2.5
Added report for owasp
@hazendaz
Add missing javadocs
2de27c1 
Using jautodoc to automatically generate out missing javadocs.
Incorrect ones are fixed as well.
@hazendaz
Update copyright to 2015
4c54314
@hazendaz
Slightly faster maven build - some cases and war update.
46a1d16
@hazendaz
Remove duplicate managed plugin.
b812f46 
war plugin is managed in parent, remove drom demo level.
@hazendaz
Fix waffle-jna dependency in demo
0618ee3 
waffle-jna is used on all, it shouldn't then be managed as that makes no
sense.  It's also duplicated otherwise in dependencies so just move
version number and remove the duplicate in dependency management.
@hazendaz
Updated tomcat 8
461ba6e
@rripley @hazendaz
For the Tomcat 8 MixedAuthenticator, a dummy LoginConfig object was
6d36ac5 
being created and used instead of pulling LoginConfig out of the
context.
@hazendaz
Update changelog for 1.7.4 release
7710523
@hazendaz
Merge pull request #212 from hazendaz/1.7.x
705d3ce 
1.7.x - Merging from master series
@hazendaz
Fixed unit tests for class MixedAuthenticatorTests and module tomcat8
d476eae
@hazendaz
Updated Jetty
631c89d 
to 9.2.7.v20150116
@hazendaz
Updated site readme
6e5b601 
updated waffle version link
updated copywrite year
@hazendaz
minor code cleanup
812cd9d 
adding missing serializable
adding missing this accessor
@hazendaz
Update copywrite year in pom.
ffbe11d
@hazendaz
Replace catch-exception with fluent-exception-rule
dae1c8d 
catch-exception relied on older mockito version.  In newer mockito
version which we use, code has been make class default thus no longer
available for external use.  I worked on catch-exception library trying
to address this but that never panned out as it was rather difficult
thing to address.  That said, this new library 'fluent-exception-rule'
utilizes junit rules and only relies on assertj which we also use.  In
fact, so did catch-exception.  The overall code is even cleaner to read.
@hazendaz
Updated maven-dependency-plugin
c5baf2a 
to 2.10
@hazendaz
Update waffle-tests mockito to 1.10.19
257996b 
Now that we have resolved issue with using catch-exception by replacing
it, we are free to upgrade back on target with mockito.
@hazendaz
Merge pull request #214 from hazendaz/1.7.x
5fe528e 
1.7.x - Cherry picking to the 1.7.4 release
@hazendaz
[maven-release-plugin] prepare release waffle-parent-1.7.4
3f17f92
@hazendaz
[maven-release-plugin] prepare for next development iteration
303f8cc
@hazendaz
[maven-release-plugin] prepare release waffle-parent-1.7.5
edef1bb
@hazendaz
[maven-release-plugin] prepare for next development iteration
10a273f
@hazendaz
Revert "Use ${project.version} throughout."
a641fa4 
This reverts commit 57ba68e.
@hazendaz
Merge pull request #215 from hazendaz/1.7.x
ee55e1f 
Revert "Use ${project.version} throughout."
@hazendaz
[maven-release-plugin] prepare release waffle-parent-1.7.4
cbe68c0
@hazendaz
Resetting me to 1.7.4
8a89d37
@hazendaz
Merge pull request #216 from hazendaz/1.7.x
b16d6ac 
Resetting me to 1.7.4
@hazendaz
fix scm tag to HEAD.
08868e0
@hazendaz
Merge pull request #217 from hazendaz/1.7.x
06f18fa 
fix scm tag to HEAD.
@hazendaz
Fix all the tags to HEAD.
b099472
@hazendaz
Merge pull request #218 from hazendaz/1.7.x
14a7ef4 
Fix all the tags to HEAD.
@hazendaz
Fix snapshots.
4caca1a
@hazendaz
Merge pull request #219 from hazendaz/1.7.x
2c35135 
Fix snapshots.
@hazendaz
[maven-release-plugin] prepare release waffle-parent-1.7.4
d19dd56
@hazendaz
Merge pull request #239 from Coveo/fix-lsass-handle-leak
0233fb2
@hazendaz
Sonatype parent is deprecated - replace with local items per sonatype
fc7d29f
@hazendaz
Apply handle leak fix to tomcat 5
8c21b4d
@hazendaz
Merge pull request #251 from hazendaz/1.7.x
72719f0 
Backport handle leak and sonatype updates to 1.7.x
@hazendaz
[gitignore] Update gitignore
77c19e4
@hazendaz
Merge pull request #288 from hazendaz/1.7.x
8bc8590 
[gitignore] Update gitignore
@hazendaz
Fix build for 1.7.5-SNAPSHOT and update all dependencies/plugins
a7864b5
@hazendaz
Merge pull request #289 from hazendaz/1.7.x
6f55799 
Fix build for 1.7.5-SNAPSHOT and update all dependencies/plugins
@hazendaz
[forced] Prepare for next release 1.7.6-SNAPSHOT
9031c58
@hazendaz
Merge pull request #290 from hazendaz/1.7.x
4d51ac0 
[forced] Prepare for next release 1.7.6-SNAPSHOT
@hazendaz
Copy link
Member

hazendaz commented Jun 12, 2017 via email

@hazendaz hazendaz closed this Jun 13, 2017
@hazendaz
Copy link
Member

I see now what the attempt was. So let me explain.

1.7.x was cut off master when 1.7.x became supported for one final year as 1.8.x came into master. There were cherry-pick patches on 1.7.x, updates, and other things that don't need to ever come into master. This same pattern is being used with 1.8.x from the current master. Because the legacy branches are not part of the main code base any longer when these cuts are made, there is zero reason to try to pull commit history into master. It would be rather pointless as the paths were diverged and therefore no benefit to bringing it in.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@PankajSharma02-Nagarro @hazendaz @cubasuarez @rripley