[Openutils-svn] SF.net SVN: openutils:[4461] magnoliamodules/trunk

[<fg...@us...>]

Revision: 4461
          http://openutils.svn.sourceforge.net/openutils/?rev=4461&view=rev
Author:   fgiust
Date:     2013-12-08 11:46:29 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
remove bobo patch

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml

Removed Paths:
-------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 11:46:29 UTC (rev 4461)
@@ -11,6 +11,7 @@
   <packaging>war</packaging>
   <artifactId>magnolia-test-webapp</artifactId>
   <name>Magnolia test webapp</name>
+  <inceptionYear>2009</inceptionYear>
   <description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
   <version>0.1-SNAPSHOT</version>
   <dependencies>
@@ -113,14 +114,14 @@
     -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -219,15 +220,9 @@
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlvanityurl</artifactId>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <dependencyManagement>
@@ -334,4 +329,4 @@
       </snapshots>
     </repository>
   </repositories>
-</project>
\ No newline at end of file
+</project>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	2013-12-08 11:46:29 UTC (rev 4461)
@@ -1,7 +1,7 @@
 /**
  *
  * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
- * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 11:46:29 UTC (rev 4461)
@@ -142,11 +142,11 @@
       <scope>test</scope>
       <version>${magnolia.version}</version>
     </dependency>
+    <!-- jackrabbit 2.4
     <dependency>
       <groupId>com.browseengine.bobo</groupId>
       <artifactId>bobo-browse</artifactId>
-      <version>3.2.0</version>
-      <!-- <version>2.5.1</version> for jackrabbit 2.4 -->
+      <version>2.5.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>
@@ -154,7 +154,19 @@
         </exclusion>
       </exclusions>
     </dependency>
+    -->
     <dependency>
+       <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>bobo-browse</artifactId>
+      <version>3.2.0.lucene36</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-context</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>fastutil</groupId>
       <artifactId>fastutil</artifactId>
       <version>5.0.5</version>

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