Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Don't include servlet-api JARs in WARs that we build #964

Merged
merged 2 commits into from
Dec 4, 2017
Merged

Don't include servlet-api JARs in WARs that we build #964

merged 2 commits into from
Dec 4, 2017

Conversation

cwardgar
Copy link
Contributor

@cwardgar cwardgar commented Dec 3, 2017

  • The culprit here was Gretty. I've updated to "com.cwardgar.gretty-fork:gretty:2.0.1", which fixes the bug.
  • In :tds:war, fail the build if we find that a "servlet-api" JAR is slated for inclusion in the WAR.
  • Use the "compileOnly" configuration that was introduced in Gradle 2.12, instead of "provided" or "providedCompile". As a result, we no longer need the "gradle-extra-configurations-plugin" plugin.
  • Maven proxy repositories are proving to be a pain. Simply use the associated source repos instead. If those repos go away, we can host the needed artifacts in "unidata-3rdparty".

@cwardgar
Don't include servlet-api JARs in WARs that we build.
fc1f20b 
* The culprit here was Gretty. I've updated to "com.cwardgar.gretty-fork:gretty:2.0.1", which fixes the bug.
* In :tds:war, fail the build if we find that a "servlet-api" JAR is slated for inclusion in the WAR.
* Use the "compileOnly" configuration that was introduced in Gradle 2.12, instead of "provided" or "providedCompile". As a result, we no longer need the "gradle-extra-configurations-plugin" plugin.
* Maven proxy repositories are proving to be a pain. Simply use the associated source repos instead. If those repos go away, we can host the needed artifacts in "unidata-3rdparty".
@cwardgar
Add a testCompile dependency on "javax.servlet-api" to TDS.
afbb1ba 
* Previously, we were relying on the one that Gretty 1.X erroneously added to "compile".
lesserwhirls
lesserwhirls approved these changes Dec 4, 2017
View reviewed changes
Copy link
Collaborator

@lesserwhirls lesserwhirls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@lesserwhirls lesserwhirls merged commit d2b01b1 into Unidata:master Dec 4, 2017
@cwardgar
Copy link
Contributor Author

cwardgar commented Dec 4, 2017

So is there anything left to get in before the release?

@lesserwhirls
Copy link
Collaborator

Nope, I don't think so. I will put a new build on thredds.ucar.edu to see how it looks there, and if everything looks ok, then I think we are good.

@cwardgar
Copy link
Contributor Author

cwardgar commented Dec 4, 2017

Ok, I'll do the release today then.

@yuanho
Copy link
Member

yuanho commented Dec 4, 2017 via email

@cwardgar
Copy link
Contributor Author

cwardgar commented Dec 4, 2017

Yes, it'll be v4.6.11

@yuanho
Copy link
Member

yuanho commented Dec 4, 2017 via email

@yuanho
Copy link
Member

yuanho commented Dec 4, 2017 via email

@cwardgar
Copy link
Contributor Author

cwardgar commented Dec 4, 2017

Done: #965

@yuanho
Copy link
Member

yuanho commented Dec 4, 2017 via email

@cwardgar cwardgar deleted the servletDep branch December 4, 2017 21:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lesserwhirls lesserwhirls lesserwhirls approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cwardgar @lesserwhirls @yuanho