You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/01/03 07:08:28 UTC

svn commit: r1054533 - in /incubator/clerezza/trunk/org.apache.clerezza.parent: ./ org.apache.clerezza.ext.com.hp.hpl.jena.tdb/ org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/ org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/ org.apache.clerezza.e...

Author: reto
Date: Mon Jan  3 06:08:28 2011
New Revision: 1054533

URL: http://svn.apache.org/viewvc?rev=1054533&view=rev
Log:
CLEREZZA-382: spressing jena-log with log4j.properties in jar, updated log4j and pax-exam versions

Added:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/log4j.properties
Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/pom.xml?rev=1054533&r1=1054532&r2=1054533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/pom.xml Mon Jan  3 06:08:28 2011
@@ -67,6 +67,8 @@
 						!com.sun.msv.*,
 						!com.sun.jdmk.*,
 						!javax.jms.*,
+						!com.ibm.uvm.tools,
+						!javax.jmdns,
 						*</Import-Package>
 						<Export-Package>com.hp.hpl.jena.*, org.apache.xerces.util</Export-Package>
 					</instructions>

Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/log4j.properties?rev=1054533&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/log4j.properties (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena.tdb/src/main/resources/log4j.properties Mon Jan  3 06:08:28 2011
@@ -0,0 +1 @@
+log4j.logger.com.hp.hpl.jena=ERROR
\ No newline at end of file

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml?rev=1054533&r1=1054532&r2=1054533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml Mon Jan  3 06:08:28 2011
@@ -189,14 +189,14 @@
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
 			<scope>provided</scope>
-			<version>1.4</version>
+			<version>1.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-service</artifactId>
 			<scope>provided</scope>
-			<version>1.4</version>
-			<exclusions>
+			<version>1.5.3</version>
+			<!-- <exclusions>
 				<exclusion>
 					<artifactId>jmxri</artifactId>
 					<groupId>com.sun.jmx</groupId>
@@ -205,7 +205,7 @@
 					<artifactId>jmxtools</artifactId>
 					<groupId>com.sun.jdmk</groupId>
 				</exclusion>
-			</exclusions>
+			</exclusions> -->
 		</dependency>
 		
 		  <!-- Core Felix. -->

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=1054533&r1=1054532&r2=1054533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Mon Jan  3 06:08:28 2011
@@ -364,44 +364,6 @@
 			</resource>
 		</resources>
 	</build>
-	<repositories>
-		<!-- for PAXEXAM-159 and 160 -->
-		<repository>
-			<id>ops4j</id>
-			<name>ops4j repository</name>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://repo1.maven.org/maven2/</url>
-			<layout>default</layout>
-		</repository>
-		<!-- neede by fix of PAXEXAM-160 -->
-		<repository>
-			<id>apache</id>
-			<name>apache repository</name>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://repository.apache.org/content/groups/snapshots-group</url>
-			<layout>default</layout>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<!-- for a version that fixes PAXEXAM-159 and 160 -->
-		<pluginRepository>
-			<id>ops4j-plugin-snapshot</id>
-			<name>ops4j.org snapshot repository</name>
-			<url>http://repo1.maven.org/maven2/</url>
-		</pluginRepository>
-		<!-- needed by fix of PAXEXAM-160 -->
-		<pluginRepository>
-			<id>apache-plugin-snapshot</id>
-			<name>apache.org snapshot repository</name>
-			<url>http://repository.apache.org/content/groups/snapshots-group</url>
-		</pluginRepository>
-	</pluginRepositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -427,11 +389,9 @@
 				<version>1.0</version>
 			</dependency>
 			<dependency>
-				<!-- this is needed as 1.2.15 point to non functional repository,
-				http://jira.codehaus.org/browse/MEV-649 -->
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>1.2.16</version>
 			</dependency>
 			<dependency>
 				<groupId>org.scala-lang</groupId>
@@ -508,32 +468,25 @@
 				<artifactId>pax-exam</artifactId>
 				<version>1.2.1</version>
 			</dependency>
-			<!-- this is a dependecy of pax-exam, enforcing latescat t version
-			to get latest felix -->
-			<dependency>
-				<groupId>org.ops4j.pax.runner</groupId>
-				<artifactId>pax-runner-no-jcl</artifactId>
-				<version>1.4.0</version>
-			</dependency>
 			<dependency>
 				<groupId>org.ops4j.pax.exam</groupId>
 				<artifactId>pax-exam-junit</artifactId>
-				<version>1.2.1</version>
+				<version>1.2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.ops4j.pax.exam</groupId>
 				<artifactId>pax-exam-junit-extender</artifactId>
-				<version>1.2.1</version>
+				<version>1.2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.ops4j.pax.exam</groupId>
 				<artifactId>pax-exam-junit-extender-impl</artifactId>
-				<version>1.2.1</version>
+				<version>1.2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.ops4j.pax.exam</groupId>
 				<artifactId>pax-exam-container-default</artifactId>
-				<version>1.2.1</version>
+				<version>1.2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.script.jruby</groupId>