Merge pull request #41 from stepio/master

jpasskit.server contains dependency errors: update jpasskit version
drallgood · May 1, 2015 · edf1e45 · edf1e45
2 parents 767987e + 6d2481f
commit edf1e45
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - 
 
 ### Fixed
+- Switched to the current version of jpasskit (and Jackson 2) in jpasskit.server
 - 
 
 ## 0.0.4 - 2014-06-11
@@ -22,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - Relevance & expiration fields for passes (iOS7 and later)
 - More information when using APNS logging
 - Switched to Jackson 2
+- Attido PassWallet support for android devices to allow linking of android apps to the pass
 
 ### Deprecated
 - Shine effect on passes (deprecated in iOS7)

diff --git a/jpasskit.server/.classpath b/jpasskit.server/.classpath
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/jpasskit.server/pom.xml b/jpasskit.server/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>de.brendamour</groupId>
 	<artifactId>jpasskit.server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>Java REST Webservice for Apples PassBook Webservice API</name>
+	<name>Java Server Example for Apple PassBook Web Service API</name>
 	<inceptionYear>2012</inceptionYear>
 	<licenses>
 		<license>
@@ -67,15 +67,14 @@
 		<dependency>
 			<groupId>de.brendamour</groupId>
 			<artifactId>jpasskit</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.restlet.jse</groupId>
 			<artifactId>org.restlet</artifactId>
 			<version>${restlet.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.restlet.jse</groupId>
 			<artifactId>org.restlet.ext.ssl</artifactId>
@@ -87,19 +86,18 @@
 			<version>${restlet.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>13.0.1</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.6.4</version>
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>13.0.1</version>
+		</dependency>
 	</dependencies>
 
 	<repositories>

diff --git a/jpasskit.server/src/main/java/de/brendamour/jpasskit/server/PKDeviceResource.java b/jpasskit.server/src/main/java/de/brendamour/jpasskit/server/PKDeviceResource.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.data.ChallengeResponse;

diff --git a/jpasskit.server/src/main/java/de/brendamour/jpasskit/server/PKPassResource.java b/jpasskit.server/src/main/java/de/brendamour/jpasskit/server/PKPassResource.java
@@ -22,8 +22,8 @@
 import java.util.Date;
 import java.util.Map;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.restlet.Request;
 import org.restlet.data.Status;
 import org.restlet.representation.InputRepresentation;
@@ -46,7 +46,7 @@ public abstract class PKPassResource extends ServerResource {
 	public PKPassResource(final String pathToPassTemplate) {
 		this.pathToPassTemplate = pathToPassTemplate;
 		jsonObjectMapper = new ObjectMapper();
-		jsonObjectMapper.setSerializationInclusion(Inclusion.NON_NULL);
+		jsonObjectMapper.setSerializationInclusion(Include.NON_NULL);
 	}
 
 	/*

diff --git a/...it.server/src/test/java/de/brendamour/jpasskit/server/PKRestletServerResourceFactory.java b/...it.server/src/test/java/de/brendamour/jpasskit/server/PKRestletServerResourceFactory.java
@@ -39,8 +39,8 @@
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.provider.X509CertificateObject;
-import org.bouncycastle.openssl.PEMReader;
-import org.codehaus.jackson.map.ObjectMapper;
+import org.bouncycastle.openssl.PEMParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.restlet.data.ChallengeResponse;
 import org.restlet.data.Status;
 import org.restlet.representation.Representation;
@@ -214,7 +214,7 @@ private KeyStore readPKCS12File(final String file, final String password) throws
 
 	private Object readKeyPair(final String file) throws IOException {
 		FileReader fileReader = new FileReader(file);
-		PEMReader r = new PEMReader(fileReader);
+		PEMParser r = new PEMParser(fileReader);
 		try {
 			return r.readObject();
 		} catch (IOException ex) {

diff --git a/jpasskit/.classpath b/jpasskit/.classpath
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/jpasskit/pom.xml b/jpasskit/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>de.brendamour</groupId>
 	<artifactId>jpasskit</artifactId>
 	<version>0.0.5-SNAPSHOT</version>
-	<name>Java Library for Apples PassBook Webservice API</name>
+	<name>Java Library for Apple PassBook Web Service API</name>
 	<inceptionYear>2012</inceptionYear>
 	<licenses>
 		<license>