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

remove servlet 3.1.0 mention, support 2.5 #310

Merged
merged 1 commit into from
Aug 18, 2016
Merged

remove servlet 3.1.0 mention, support 2.5 #310

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
7 changes: 3 additions & 4 deletions appengine/helloworld-new-plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ apply plugin: 'java' // standard Java tasks
apply plugin: 'war' // standard Web Archive plugin
apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks

dependencies { // Servlet for App Engine Standard -- only one of these need to be uncommented.
// providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
providedCompile 'javax.servlet:javax.servlet-api:3.1.0' // if java_quickstart in appengine-web.xml
dependencies {
providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
compile 'com.google.appengine:appengine:+'
// Add your dependencies here.

Expand All @@ -47,7 +46,7 @@ dependencies { // Servlet for App Engine Standard -- only one of these need to b
model {
appengine { // App Engine tasks configuration
run { // local (dev_appserver) configuration (standard environments only)
port = 8080 // default
port = 8080 // default
}

deploy { // deploy configuration
Expand Down