manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1782360 - in /manifoldcf/trunk: framework/jetty-runner/pom.xml pom.xml test-materials/pom.xml
Date Thu, 09 Feb 2017 16:16:26 GMT
Author: kwright
Date: Thu Feb  9 16:16:25 2017
New Revision: 1782360

URL: http://svn.apache.org/viewvc?rev=1782360&view=rev
Log:
Fix for CONNECTORS-1377; not quite the patch given, but should do the same thing.

Modified:
    manifoldcf/trunk/framework/jetty-runner/pom.xml
    manifoldcf/trunk/pom.xml
    manifoldcf/trunk/test-materials/pom.xml

Modified: manifoldcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/pom.xml?rev=1782360&r1=1782359&r2=1782360&view=diff
==============================================================================
--- manifoldcf/trunk/framework/jetty-runner/pom.xml (original)
+++ manifoldcf/trunk/framework/jetty-runner/pom.xml Thu Feb  9 16:16:25 2017
@@ -292,11 +292,26 @@
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${glassfish.version}</version>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper-el</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt.core.compiler</groupId>
+      <artifactId>ecj</artifactId>
+      <version>${ecj.version}</version>
     </dependency>
 
     <!-- databases -->

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1782360&r1=1782359&r2=1782360&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Feb  9 16:16:25 2017
@@ -88,10 +88,12 @@
     <jhighlight.version>1.0.3</jhighlight.version>
     <boilerpipe.version>1.1.0</boilerpipe.version>
     <hadoop.version>2.6.0</hadoop.version>
+    <tomcat.version>6.0.35</tomcat.version>
+    <ecj.version>4.3.1</ecj.version>
   </properties>
 
   <modules>
-    <module>framework</module>
+      <module>framework</module>
     <module>test-materials</module>
     <module>connectors</module>
     <module>framework/jetty-runner</module>

Modified: manifoldcf/trunk/test-materials/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/pom.xml?rev=1782360&r1=1782359&r2=1782360&view=diff
==============================================================================
--- manifoldcf/trunk/test-materials/pom.xml (original)
+++ manifoldcf/trunk/test-materials/pom.xml Thu Feb  9 16:16:25 2017
@@ -14,7 +14,8 @@
  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/xsd/maven-4.0.0.xsd">
+-->
+<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/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.manifoldcf</groupId>
     <artifactId>mcf-parent</artifactId>



Mime
View raw message