[java-centralized-discovery COMMIT] in /branches/REL_1: LICENSE.txt doc/LICENSE.txt doc/RELEASE-NOTES.txt pom.xml src...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Mar 14 11:35:18 2012
New Revision: 2216

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2216&view=rev
Log:
Move LICENSE file to doc directory like the rest of our projects
Clean up assembly file a bit
Peg the version commons codec and joda-time to those used by opensaml

Added:
    branches/REL_1/doc/LICENSE.txt   (contents, props changed)
      - copied, changed from r2215, branches/REL_1/LICENSE.txt
Removed:
    branches/REL_1/LICENSE.txt
Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/assembly/bin.xml

Copied: branches/REL_1/doc/LICENSE.txt (from r2215, branches/REL_1/LICENSE.txt)
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/doc/LICENSE.txt?p2=branches/REL_1/doc/LICENSE.txt&p1=branches/REL_1/LICENSE.txt&r1=2215&r2=2216&rev=2216&view=diff
==============================================================================
    (empty)

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/doc/RELEASE-NOTES.txt?rev=2216&r1=2215&r2=2216&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Wed Mar 14 11:35:18 2012
@@ -1,14 +1,14 @@
 Changes in Release 1.2
+=============================================
 [SDSJ-102] Do not show non usable IdPs when in WAYF mode
 [SDSJ-105] wayf.jsp fails to properly escape mdui:DisplayName, causing javascript error and Suggest.js to fail to work
 [SDSJ-103] decoding of returnX query string parameter
 [SDSJ-101] CDS should (possibly configurably) initialize the context (and metadata load) when the CDS starts
 [SDSJ-106] Metadata provision to the DS. Preventative maintenance and feature enchancement
+[SDSJ-107] Update dependencies
 
 Changes in Release 1.1.3
 =============================================
-The precise Cases changed are.
-
 [SDSJ-88] The IdP has to be encoded before it goes over the wire.
 [SDSJ-89] By default always show some possible results.
 [SDSJ-82] Make <Mdui> extensions available to the JSP.
@@ -20,4 +20,4 @@
 [SDSJ-61] DS looses last known good data if it is presented with bad metadata
 [SDSJ-99] Strip out "javascript" jsp
 
-And updated to OpenSAML 2.5.1
+And updated to OpenSAML 2.5.1

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/pom.xml?rev=2216&r1=2215&r2=2216&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Wed Mar 14 11:35:18 2012
@@ -46,6 +46,16 @@
 
     <dependencies>
         <!-- Compile dependencies -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>1.6.2</version>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

Modified: branches/REL_1/src/main/assembly/bin.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/assembly/bin.xml?rev=2216&r1=2215&r2=2216&view=diff
==============================================================================
--- branches/REL_1/src/main/assembly/bin.xml (original)
+++ branches/REL_1/src/main/assembly/bin.xml Wed Mar 14 11:35:18 2012
@@ -20,6 +20,7 @@
             </includes>
             <excludes>
                 <exclude>javax.servlet:*</exclude>
+                <exclude>*:jcip-annotations:*</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
@@ -77,35 +78,11 @@
             <outputDirectory>/src/main/webapp</outputDirectory>
         </fileSet>
 
-        <!-- Docs -->
-        <fileSet>
-            <includes>
-                <include>RELEASE-NOTES*</include>
-                <include>LICENSE*</include>
-            </includes>
-        </fileSet>
-
         <!-- Documentation -->
         <fileSet>
             <directory>doc/</directory>
             <outputDirectory>/doc</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>/doc/api</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/style</directory>
-            <outputDirectory>/doc/style</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/unitTest</directory>
-            <outputDirectory>/doc/unitTest</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/xref</directory>
-            <outputDirectory>/doc/src-xref</outputDirectory>
-        </fileSet>
     </fileSets>
 
 </assembly>