Skip to content

Update javaspark so it works. #487

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

Merged
merged 1 commit into from
Jan 13, 2017
+8 −7
Merged

Update javaspark so it works. #487

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
7 changes: 4 additions & 3 deletions flexible/sparkjava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
<app.stage.artifact>${project.build.directory}/spark-1.0-jar-with-dependencies.jar</app.stage.artifact>
</properties>

<dependencies>
Expand All @@ -44,8 +45,8 @@
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud</artifactId>
<version>0.4.0</version>
<artifactId>google-cloud-datastore</artifactId>
<version>0.8.1-beta</version>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -83,7 +84,7 @@
<mainClass>com.google.appengine.sparkdemo.Main</mainClass>
<arguments>
<argument>-jar</argument>
<argument>target/spark-1.0-jar-with-dependencies.jar</argument>
<argument>${app.stage.stagingDirectory}/spark-1.0-jar-with-dependencies.jar</argument>
</arguments>
</configuration>
</plugin>
Expand Down
0 ...e/sparkjava/src/main/appengine/Dockerfile → ...ible/sparkjava/src/main/docker/Dockerfile
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
import com.google.cloud.datastore.testing.LocalDatastoreHelper;
import com.google.common.collect.Iterators;

import org.joda.time.Duration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeoutException;

public class UserServiceTest {

Expand Down Expand Up @@ -72,8 +74,8 @@ public void setUp() {
}

@AfterClass
public static void afterClass() throws IOException, InterruptedException {
HELPER.stop();
public static void afterClass() throws IOException, InterruptedException, TimeoutException {
HELPER.stop(Duration.standardMinutes(1));
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@
<module>flexible/mailjet</module>
<module>flexible/memcache</module>
<module>flexible/sendgrid</module>
<!--
<module>flexible/sparkjava</module>
-->
<module>flexible/static-files</module>
<module>flexible/twilio</module>
<module>language/analysis</module>
Expand Down