[Building Sakai] Building v2.6.1 under Java 1.6

[Steve Swinsburg]

Hi George,

That patch is a git patch which can't be directly applied to the Sakai source since we use SVN for version control. I've manualy adjust the patch to be svn compatible and it runs:

patch -p0 --dry-run < ~/Desktop/SAK-16741-svn.patch 
patching file pom.xml
patching file search-impl/impl/pom.xml
Hunk #1 succeeded at 16 with fuzz 2.
patching file search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
patching file search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test/TDataSource.java
patching file search-test/pom.xml
patching file search-test/test-1.5/pom.xml
patching file search-test/test-1.5/src/java/org/sakaiproject/search/jdbc/WrappingConnection.java
patching file search-test/test-1.5/src/java/org/sakaiproject/search/jdbc/WrappingDataSource.java
patching file search-test/test-1.6/pom.xml
patching file search-test/test-1.6/src/java/org/sakaiproject/search/jdbc/WrappingConnection.java
patching file search-test/test-1.6/src/java/org/sakaiproject/search/jdbc/WrappingDataSource.java

Attached to original Jira:
http://jira.sakaiproject.org/browse/SAK-16741

cheers,
Steve


On 13/12/2009, at 12:27 PM, George Pipkin wrote:

> Hi -
> 
>   Yesterday I checked out a copy of v2.6.1 from 
> source.sakaiproject.org.  The svn info
> relating to it is:
> 
> bash-3.2# svn info
> Path: .
> URL: https://source.sakaiproject.org/svn/sakai/tags/sakai-2.6.1
> Repository Root: https://source.sakaiproject.org/svn
> Repository UUID: 66ffb92e-73f9-0310-93c1-f5514f145a0a
> Revision: 69654
> Node Kind: directory
> Schedule: normal
> Last Changed Author: arwhyte at umich.edu
> Last Changed Rev: 67892
> Last Changed Date: 2009-10-15 10:52:50 -0400 (Thu, 15 Oct 2009)
> 
> 
> I tried to build it under Java 1.6, and suprisingly I ran into the 
> problem described in       SAK-16741
> (Search unit tests fail when built with Java 1.6) even though I had in 
> my maven settings.xml
> file the line:
> 
> <maven.test.skip>true</maven.test.skip>
> 
> My understanding from that Jira is that there was a patch that was 
> incorporated as of r66500 (rev
> mentioned above is 69654).  Anyway, I downloaded the patch and teried to 
> apply it with the following results:
> 
> bash-3.2# patch -p0 < SAK-16741.patch
> can't find file to patch at input line 5
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git a/pom.xml b/pom.xml
> |index 857a893..c0d6024 100644
> |--- a/pom.xml
> |+++ b/pom.xml
> --------------------------
> File to patch: ^C
> bash-3.2# patch -p0<SAK-16741.patch
> can't find file to patch at input line 5
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git a/pom.xml b/pom.xml
> |index 857a893..c0d6024 100644
> |--- a/pom.xml
> |+++ b/pom.xml
> --------------------------
> File to patch: ^C
> bash-3.2# man patch
> bash-3.2# patch<SAK-16741.patch
> patching file pom.xml
> Hunk #1 FAILED at 28.
> Hunk #2 FAILED at 47.
> 2 out of 2 hunks FAILED -- saving rejects to file pom.xml.rej
> patching file pom.xml
> Hunk #1 FAILED at 16.
> 1 out of 1 hunk FAILED -- saving rejects to file pom.xml.rej
> can't find file to patch at input line 66
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git 
> a/search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java 
> b/search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
> |index 218aeea..c4c2e3c 100644
> |--- 
> a/search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
> |+++ 
> b/search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
> --------------------------
> File to patch: ^C
> bash-3.2# ls *.patch
> SAK-16741.patch
> bash-3.2# svn info
> Path: .
> URL: https://source.sakaiproject.org/svn/sakai/tags/sakai-2.6.1
> Repository Root: https://source.sakaiproject.org/svn
> Repository UUID: 66ffb92e-73f9-0310-93c1-f5514f145a0a
> Revision: 69654
> Node Kind: directory
> Schedule: normal
> Last Changed Author: arwhyte at umich.edu
> Last Changed Rev: 67892
> Last Changed Date: 2009-10-15 10:52:50 -0400 (Thu, 15 Oct 2009)
> 
> bash-3.2#
> 
> 
> 
> So - I am wondering - what do I need to do to build this release under 
> Java 6.1, since Java 5 is no
> longer supported.....
> 
> 
>                                  - George Pipkin
>                                     U.Va.
> _______________________________________________
> sakai-dev mailing list
> sakai-dev at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
> 
> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3823 bytes
Desc: not available
Url : http://collab.sakaiproject.org/pipermail/sakai-dev/attachments/20091213/6f6cd4e7/attachment.bin