You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/02/28 15:02:47 UTC

svn commit: r1294663 - in /incubator/stanbol/trunk: ontologymanager/web/pom.xml reengineer/db/pom.xml reengineer/web/pom.xml reengineer/xml/pom.xml

Author: alexdma
Date: Tue Feb 28 14:02:47 2012
New Revision: 1294663

URL: http://svn.apache.org/viewvc?rev=1294663&view=rev
Log:
Applied patches by Alberto Musetti for STANBOL-514 and STANBOL-517 . Also removed codehaus and apache-snapshots repositories

Modified:
    incubator/stanbol/trunk/ontologymanager/web/pom.xml
    incubator/stanbol/trunk/reengineer/db/pom.xml
    incubator/stanbol/trunk/reengineer/web/pom.xml
    incubator/stanbol/trunk/reengineer/xml/pom.xml

Modified: incubator/stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/pom.xml?rev=1294663&r1=1294662&r2=1294663&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/web/pom.xml Tue Feb 28 14:02:47 2012
@@ -7,12 +7,13 @@
     2.0 (the "License"); you may not use this file except in compliance
     with the License. You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-    applicable law or agreed to in writing, software distributed under the
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-    CONDITIONS OF ANY KIND, either express or implied. See the License for
-    the specific language governing permissions and limitations under the
-    License.
+    http://www.apache.org/licenses/LICENSE-2.0 
+    
+    Unless required by applicable law or agreed to in writing, software 
+    distributed under the License is distributed on an "AS IS" BASIS, 
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+    implied. See the License for the specific language governing 
+    permissions and limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -219,13 +220,7 @@
       <artifactId>jersey-client</artifactId>
       <scope>test</scope>
     </dependency>
+    
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>stlab-cnr-repo</id>
-      <url>http://stlab.istc.cnr.it/software/maven/repo</url>
-    </repository>
-  </repositories>
-
 </project>

Modified: incubator/stanbol/trunk/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/pom.xml?rev=1294663&r1=1294662&r2=1294663&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/db/pom.xml Tue Feb 28 14:02:47 2012
@@ -168,12 +168,4 @@
 
 	</dependencies>
 
-
-	<repositories>
-		<repository>
-			<id>stlab-cnr-repo</id>
-			<url>http://stlab.istc.cnr.it/software/maven/repo</url>
-		</repository>
-	</repositories>
-
 </project>

Modified: incubator/stanbol/trunk/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/pom.xml?rev=1294663&r1=1294662&r2=1294663&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/web/pom.xml Tue Feb 28 14:02:47 2012
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 
+    
+    Unless required by applicable law or agreed to in writing, software 
+    distributed under the License is distributed on an "AS IS" BASIS, 
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+    implied. See the License for the specific language governing 
+    permissions and limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -159,41 +159,6 @@
       <artifactId>org.apache.felix.scr.annotations</artifactId>
     </dependency>
 
-    <!-- for tests 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-client</artifactId>
-      <version>${jersey-version}</version>
-      <scope>test</scope>
-    </dependency>
-    -->
-    <!-- 
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam</artifactId>
-      <version>${pax-exam-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-junit</artifactId>
-      <version>${pax-exam-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-default</artifactId>
-      <version>${pax-exam-version}</version>
-      <scope>test</scope>
-    </dependency>
-     -->
-
     <!-- Stanbol deps -->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
@@ -223,29 +188,4 @@
 
   </dependencies>
 
-  <repositories>
-    <!-- needed for jersey -->
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-    </repository>
-    <repository>
-      <id>repository-codehaus</id>
-      <name>Codehaus maven repository</name>
-      <url>http://repository.codehaus.org</url>
-    </repository>
-
-    <!-- needed for clerezza SNAPSHOT only -->
-    <repository>
-      <id>apache repository - snapshot repo</id>
-      <name>apache repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </repository>
-    <repository>
-    	<id>stlab-cnr-repo</id>
-        <url>http://stlab.istc.cnr.it/software/maven/repo</url>
-    </repository>
-  </repositories>
-
 </project>

Modified: incubator/stanbol/trunk/reengineer/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/pom.xml?rev=1294663&r1=1294662&r2=1294663&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/xml/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/xml/pom.xml Tue Feb 28 14:02:47 2012
@@ -173,16 +173,4 @@
 
 	</dependencies>
 
-	<repositories>
-		<repository>
-			<id>codehaus</id>
-			<name>Maven Codehaus repository</name>
-			<url>http://repository.codehaus.org/</url>
-		</repository>
-		<repository>
-			<id>stlab-cnr-repo</id>
-			<url>http://stlab.istc.cnr.it/software/maven/repo</url>
-		</repository>
-	</repositories>
-
 </project>