[aperture-commit] SF.net SVN: aperture:[2332] aperture-osgi/trunk

[<my...@us...>]

Revision: 2332
          http://aperture.svn.sourceforge.net/aperture/?rev=2332&view=rev
Author:   mylka
Date:     2010-04-25 19:32:20 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
fixed the aperture-osgi module - made it build

Modified Paths:
--------------
    aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
    aperture-osgi/trunk/onejar/pom.xml
    aperture-osgi/trunk/pom.xml

Property Changed:
----------------
    aperture-osgi/trunk/docs/


Property changes on: aperture-osgi/trunk/docs
___________________________________________________________________
Modified: svn:ignore
   - target

   + target

.classpath


Modified: aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
===================================================================
--- aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java	2010-04-22 19:11:14 UTC (rev 2331)
+++ aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java	2010-04-25 19:32:20 UTC (rev 2332)
@@ -122,13 +122,6 @@
 //		}
     }
     
-    private String[] getRequiredLibBundles() {
-		return new String[] {
-				"org.semweb4j, rdf2go.api, 4.7.2",
-				"org.slf4j, jcl-over-slf4j, 1.5.6",
-				"org.slf4j, slf4j-api, 1.5.6"};
-	}
-    
 //    private String[] getRequiredLibBundles() {
 //		return new String[] {
 //				"com.aetrion.flickr, flickrapi, 1.2.bundle",
@@ -178,10 +171,17 @@
 //				"xml-apis, xml-apis, 1.3.4.v200902170245_orbit"};
 //	}
     
+    private String[] getRequiredLibBundles() {
+		return new String[] {
+				"org.semweb4j, rdf2go.api, 4.7.3",
+				"org.slf4j, jcl-over-slf4j, 1.5.10",
+				"org.slf4j, slf4j-api, 1.5.10"};
+	}
+    
     public static String [] getOptionalBundles() {
     	return new String[] {
-				"org.slf4j, slf4j-jdk14, 1.5.6",
-				"org.openrdf.sesame, sesame-runtime-osgi, 2.3.0",
+				"org.slf4j, slf4j-jdk14, 1.5.10",
+				"org.openrdf.sesame, sesame-runtime-osgi, 2.3.1",
 				"org.semweb4j, rdf2go.impl.sesame23, 4.7.3-SNAPSHOT-RTGO70"};
     }
     

Modified: aperture-osgi/trunk/onejar/pom.xml
===================================================================
--- aperture-osgi/trunk/onejar/pom.xml	2010-04-22 19:11:14 UTC (rev 2331)
+++ aperture-osgi/trunk/onejar/pom.xml	2010-04-25 19:32:20 UTC (rev 2332)
@@ -50,7 +50,7 @@
 			<plugin>   
 				<groupId>org.semanticdesktop.aperture</groupId>
 				<artifactId>aperture-fileremover-maven-plugin</artifactId>
-				<version>${aperture.version}</version>
+				<version>1.0</version>
 				<configuration>
 				    <jarFile>target/${project.build.finalName}.jar</jarFile>
 				    <extensions>

Modified: aperture-osgi/trunk/pom.xml
===================================================================
--- aperture-osgi/trunk/pom.xml	2010-04-22 19:11:14 UTC (rev 2331)
+++ aperture-osgi/trunk/pom.xml	2010-04-25 19:32:20 UTC (rev 2332)
@@ -166,6 +166,14 @@
 		   <url>http://aperture.sf.net/maven</url>
 		</repository>
 	</repositories>
+	
+	<pluginRepositories>
+		<pluginRepository>
+		   <id>aperture-repo</id>
+		   <name>Aperture Dependencies Repo</name>
+		   <url>http://aperture.sf.net/maven</url>
+		</pluginRepository>
+	</pluginRepositories>
 
 	<scm>
 		<connection>scm:svn:http://aperture.svn.sourceforge.net/svnroot/aperture/aperture-osgi/trunk</connection>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.