wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1028535 - in /incubator/wink/trunk: ./ wink-assembly/apache-wink/ wink-assembly/apache-wink/src/main/assembly/ wink-assembly/wink-assembly-aggregatejar/ wink-assembly/wink-assembly-aggregatejar/src/main/assembly/
Date Thu, 28 Oct 2010 23:14:16 GMT
Author: bluk
Date: Thu Oct 28 23:14:16 2010
New Revision: 1028535

URL: http://svn.apache.org/viewvc?rev=1028535&view=rev
Log:
Add json4j and jackson packages to distribution

Modified:
    incubator/wink/trunk/pom.xml
    incubator/wink/trunk/wink-assembly/apache-wink/pom.xml
    incubator/wink/trunk/wink-assembly/apache-wink/src/main/assembly/distbin.xml
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=1028535&r1=1028534&r2=1028535&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Thu Oct 28 23:14:16 2010
@@ -434,6 +434,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.wink</groupId>
+                <artifactId>wink-jackson-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
                 <artifactId>wink-jettison-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -447,6 +452,11 @@
                 <artifactId>wink-json4j</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-json4j-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- 3rd party dependencies -->
             <dependency>

Modified: incubator/wink/trunk/wink-assembly/apache-wink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/apache-wink/pom.xml?rev=1028535&r1=1028534&r2=1028535&view=diff
==============================================================================
--- incubator/wink/trunk/wink-assembly/apache-wink/pom.xml (original)
+++ incubator/wink/trunk/wink-assembly/apache-wink/pom.xml Thu Oct 28 23:14:16 2010
@@ -75,10 +75,22 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-jackson-provider</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
                     <artifactId>wink-jettison-provider</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-json4j</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-json4j-provider</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
                     <artifactId>wink-json-provider</artifactId>
                 </dependency>
                 <dependency>

Modified: incubator/wink/trunk/wink-assembly/apache-wink/src/main/assembly/distbin.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/apache-wink/src/main/assembly/distbin.xml?rev=1028535&r1=1028534&r2=1028535&view=diff
==============================================================================
--- incubator/wink/trunk/wink-assembly/apache-wink/src/main/assembly/distbin.xml (original)
+++ incubator/wink/trunk/wink-assembly/apache-wink/src/main/assembly/distbin.xml Thu Oct 28
23:14:16 2010
@@ -101,6 +101,15 @@
         </dependencySet>
         <dependencySet>
             <includes>
+                <include>org.apache.wink:wink-jackson-provider</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-jackson-provider</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <directoryMode>0755</directoryMode>
+        </dependencySet>
+        <dependencySet>
+            <includes>
                 <include>org.apache.wink:wink-jettison-provider</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
@@ -119,6 +128,24 @@
         </dependencySet>
         <dependencySet>
             <includes>
+                <include>org.apache.wink:wink-json4j</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-json4j/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <directoryMode>0755</directoryMode>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-json4j-provider</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-json4j-provider</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <directoryMode>0755</directoryMode>
+        </dependencySet>
+        <dependencySet>
+            <includes>
                 <include>org.apache.wink:wink-json-provider</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>

Modified: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml?rev=1028535&r1=1028534&r2=1028535&view=diff
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml (original)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml Thu Oct 28 23:14:16
2010
@@ -67,6 +67,10 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-json4j</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
                     <artifactId>wink-client-apache-httpclient</artifactId>
                 </dependency>
             </dependencies>

Modified: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml?rev=1028535&r1=1028534&r2=1028535&view=diff
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml
(original)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml
Thu Oct 28 23:14:16 2010
@@ -65,6 +65,19 @@
         </dependencySet>
         <dependencySet>
             <includes>
+                <include>org.apache.wink:wink-json4j</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <excludes>
+                    <exclude>**/NOTICE</exclude>
+                    <exclude>**/DEPENDENCIES</exclude>
+                    <exclude>**/DISCLAIMER</exclude>
+                </excludes>
+            </unpackOptions>
+        </dependencySet>
+        <dependencySet>
+            <includes>
                 <include>org.apache.wink:wink-webdav</include>
             </includes>
             <unpack>true</unpack>



Mime
View raw message