You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/11/12 16:52:08 UTC

[20/32] usergrid git commit: fix exclusion with new version of wns lib

fix exclusion with new version of wns lib


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d42d82cb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d42d82cb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d42d82cb

Branch: refs/heads/master
Commit: d42d82cb97000581912299171690a5148df18dfa
Parents: 5a39c05
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 6 15:26:29 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 6 15:26:29 2015 -0700

----------------------------------------------------------------------
 .../1.3.1-USERGRID/_remote.repositories         |   7 ++
 ...wns-1.3.1-USERGRID-jar-with-dependencies.jar | Bin 0 -> 6806358 bytes
 .../java-wns-1.3.1-USERGRID-javadoc.jar         | Bin 0 -> 240001 bytes
 .../java-wns-1.3.1-USERGRID-sources.jar         | Bin 0 -> 22656 bytes
 .../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar  | Bin 0 -> 34924 bytes
 .../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom  | 115 +++++++++++++++++++
 stack/pom.xml                                   |  14 +--
 stack/rest/pom.xml                              |  10 ++
 stack/services/pom.xml                          |   3 +-
 9 files changed, 141 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
new file mode 100644
index 0000000..b24cacf
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
@@ -0,0 +1,7 @@
+#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
+#Fri Nov 06 15:17:59 MST 2015
+java-wns-1.3.1-USERGRID-sources.jar>=
+java-wns-1.3.1-USERGRID-jar-with-dependencies.jar>=
+java-wns-1.3.1-USERGRID.jar>=
+java-wns-1.3.1-USERGRID-javadoc.jar>=
+java-wns-1.3.1-USERGRID.pom>=

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
new file mode 100644
index 0000000..f118d2f
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
new file mode 100644
index 0000000..7c902ad
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
new file mode 100644
index 0000000..74dc5a0
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
new file mode 100644
index 0000000..dce3b10
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
new file mode 100644
index 0000000..8939db3
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
@@ -0,0 +1,115 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.github.fernandospr</groupId>
+	<artifactId>java-wns</artifactId>
+	<packaging>jar</packaging>
+	<version>1.3.1-USERGRID</version>
+	<name>java-wns</name>
+	<description>Library to send notifications using WNS</description>
+	<url>https://github.com/fernandospr/java-wns</url>
+	<licenses>
+		<license>
+			<name>New BSD License</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<!-- Inherit the Sonatype OSS deployment configuration -->
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+
+	<scm>
+		<connection>scm:git:git@github.com:fernandospr/java-wns.git</connection>
+		<url>scm:git:git@github.com:fernandospr/java-wns.git</url>
+		<developerConnection>scm:git:git@github.com:fernandospr/java-wns.git</developerConnection>
+	</scm>
+	<developers>
+		<developer>
+			<id>fernandospr</id>
+			<name>Fernando Sproviero</name>
+		</developer>
+	</developers>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>1.19</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.connectors</groupId>
+			<artifactId>jersey-apache-connector</artifactId>
+			<version>2.16</version>
+		</dependency>
+		<dependency>
+        		<groupId>com.fasterxml.jackson.jaxrs</groupId>
+        		<artifactId>jackson-jaxrs-xml-provider</artifactId>
+        		<version>2.3.3</version>
+      		</dependency>
+      		<dependency>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-json-provider</artifactId>
+                <version>2.3.3</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index dfa5045..ae55ea1 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1647,13 +1647,13 @@
   </reporting>
 
 
-    <!--<repositories>-->
-        <!--<repository>-->
-            <!--<id>local-dependencies</id>-->
-            <!--<name>local-depedendencies</name>-->
-            <!--<url>file://${project.basedir}/../m2/repository</url>-->
-        <!--</repository>-->
-    <!--</repositories>-->
+    <repositories>
+        <repository>
+            <id>local-dependencies</id>
+            <name>local-depedendencies</name>
+            <url>file://${project.basedir}/../m2/repository</url>
+        </repository>
+    </repositories>
 
     <scm>
     	<url>https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git</url>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 6c47d82..7b1bad6 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -408,6 +408,16 @@
             <scope>test</scope>
             <classifier>tests</classifier>
         </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-apache-client</artifactId>
+            <version>1.19</version>
+        </dependency>
 
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index d1ec212..5560079 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -434,10 +434,11 @@
       <artifactId>stream</artifactId>
       <version>2.7.0</version>
     </dependency>
+      <!-- fork: https://github.com/apigee/java-wns/tree/usergrid -->
       <dependency>
           <groupId>com.github.fernandospr</groupId>
           <artifactId>java-wns</artifactId>
-          <version>1.3</version>
+          <version>1.3.1-USERGRID</version>
           <exclusions>
               <exclusion>
                   <artifactId>jackson-jaxrs</artifactId>