Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opengrok-indexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <cfraire@me.com>.
<goal>run</goal>
</goals>
<configuration>
<target unless="maven.test.skip">
<target unless="skipTests">
<ant target="-post-compile-test"/>
</target>
</configuration>
Expand Down
40 changes: 40 additions & 0 deletions opengrok-web/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

CDDL HEADER START

The contents of this file are subject to the terms of the
Common Development and Distribution License (the "License").
You may not use this file except in compliance with the License.

See LICENSE.txt included in this distribution for the specific
language governing permissions and limitations under the License.

When distributing Covered Code, include this CDDL HEADER in each
file and include the License file at LICENSE.txt.
If applicable, add the following below this CDDL HEADER, with the
fields enclosed by brackets "[]" replaced with your own identifying
information: Portions Copyright [yyyy] [name of copyright owner]

CDDL HEADER END

Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.

-->
<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">
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -117,6 +140,23 @@
<finalName>source</finalName>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jspc-maven-plugin</artifactId>
<version>9.4.14.v20181114</version>
<executions>
<execution>
<id>jspc</id>
<goals>
<goal>jspc</goal>
</goals>
<configuration>
<mergeFragment>false</mergeFragment>
<generatedClasses>${project.build.directory}/jspc</generatedClasses>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion opengrok-web/src/main/webapp/opensearch.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ information: Portions Copyright [yyyy] [name of copyright owner]
CDDL HEADER END

Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.

Portions Copyright 2011 Jens Elkner.
Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.

--%><%@page session="false" errorPage="error.jsp" import="
java.util.Set,

org.opengrok.indexer.web.Prefix,
org.opengrok.indexer.web.Util"
%>
<%
Expand Down