Skip to content

Commit 1a2bb6b

Browse files
ahornaceahornace
committed
Fix issues after merge
1 parent 4ce4e2b commit 1a2bb6b

34 files changed

+297
-131
lines changed

‎opengrok-indexer/pom.xml

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
3737

3838
<name>OpenGrok Indexer</name>
3939

40-
<properties>
41-
<jersey.version>2.27</jersey.version>
42-
</properties>
43-
4440
<dependencies>
4541
<dependency>
4642
<groupId>org.apache.bcel</groupId>
@@ -100,14 +96,9 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
10096
<groupId>org.apache.ant</groupId>
10197
<artifactId>ant</artifactId>
10298
</dependency>
103-
<dependency>
104-
<groupId>org.glassfish.jersey.containers</groupId>
105-
<artifactId>jersey-container-servlet</artifactId>
106-
<version>${jersey.version}</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.glassfish.jersey.inject</groupId>
110-
<artifactId>jersey-hk2</artifactId>
99+
<dependency> <!-- TODO: remove! (moving Messages to web module) -->
100+
<groupId>org.glassfish.jersey.ext</groupId>
101+
<artifactId>jersey-bean-validation</artifactId>
111102
<version>${jersey.version}</version>
112103
</dependency>
113104
<dependency>
@@ -116,42 +107,26 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
116107
<version>${jersey.version}</version>
117108
</dependency>
118109
<dependency>
119-
<groupId>org.glassfish.jersey.ext</groupId>
120-
<artifactId>jersey-bean-validation</artifactId>
110+
<groupId>org.glassfish.jersey.core</groupId>
111+
<artifactId>jersey-client</artifactId>
121112
<version>${jersey.version}</version>
122113
</dependency>
123114
<dependency>
124-
<groupId>javax.xml.bind</groupId>
125-
<artifactId>jaxb-api</artifactId>
126-
<version>2.3.0</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>javax.activation</groupId>
130-
<artifactId>activation</artifactId>
131-
<version>1.1</version>
115+
<groupId>org.glassfish.jersey.inject</groupId>
116+
<artifactId>jersey-hk2</artifactId>
117+
<version>${jersey.version}</version>
132118
</dependency>
133119
<dependency>
134120
<groupId>junit</groupId>
135121
<artifactId>junit</artifactId>
136122
<scope>test</scope>
137123
</dependency>
138-
<dependency>
124+
<dependency> <!-- TODO: remove! (moving Messages to web module) -->
139125
<groupId>org.awaitility</groupId>
140126
<artifactId>awaitility</artifactId>
141127
<version>3.1.0</version>
142128
<scope>test</scope>
143129
</dependency>
144-
<dependency>
145-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
146-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
147-
<version>${jersey.version}</version>
148-
<scope>test</scope>
149-
</dependency>
150-
<dependency>
151-
<groupId>org.mockito</groupId>
152-
<artifactId>mockito-core</artifactId>
153-
<version>2.19.0</version>
154-
<scope>test</scope>
155130
</dependencies>
156131

157132
<build>
@@ -173,6 +148,13 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
173148
</manifestEntries>
174149
</archive>
175150
</configuration>
151+
<executions> <!-- so the web module can use test classes from indexer module -->
152+
<execution>
153+
<goals>
154+
<goal>test-jar</goal>
155+
</goals>
156+
</execution>
157+
</executions>
176158
</plugin>
177159

178160
<plugin>
@@ -302,7 +284,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
302284
<!-- Test helper class with name that confuses surefire -->
303285
<exclude>**/TestRepository.java</exclude>
304286
</excludes>
305-
<argLine>${surefireArgLine}</argLine>
287+
<argLine>${surefireArgLine}</argLine>
306288
</configuration>
307289
</plugin>
308290

‎src/org/opensolaris/opengrok/analysis/executables/JFieldBuilder.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/executables/JFieldBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
*/
2323

24-
package org.opensolaris.opengrok.analysis.executables;
24+
package org.opengrok.indexer.analysis.executables;
2525

2626
import java.io.StringWriter;
2727
import java.util.HashMap;

‎opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public Map<String, String> getCmds() {
505505
}
506506

507507
/**
508-
* @see org.opensolaris.opengrok.web.messages.MessagesContainer
508+
* @see org.opengrok.indexer.web.messages.MessagesContainer
509509
*
510510
* @return int the current message limit
511511
*/
@@ -514,7 +514,7 @@ public int getMessageLimit() {
514514
}
515515

516516
/**
517-
* @see org.opensolaris.opengrok.web.messages.MessagesContainer
517+
* @see org.opengrok.indexer.web.messages.MessagesContainer
518518
*
519519
* @param messageLimit the limit
520520
* @throws IllegalArgumentException when the limit is negative

‎src/org/opensolaris/opengrok/index/IndexerUtil.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexerUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.index;
23+
package org.opengrok.indexer.index;
2424

2525
import javax.ws.rs.client.ClientBuilder;
2626
import javax.ws.rs.client.Entity;

‎opengrok-indexer/src/main/java/org/opengrok/indexer/search/Results.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.opengrok.indexer.web.SearchHelper;
6161
import org.opengrok.indexer.web.Util;
6262

63-
import static org.opensolaris.opengrok.web.messages.MessagesContainer.MESSAGES_MAIN_PAGE_TAG;
63+
import static org.opengrok.indexer.web.messages.MessagesContainer.MESSAGES_MAIN_PAGE_TAG;
6464

6565
/**
6666
* @author Chandan slightly rewritten by Lubos Kosco

‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
import javax.servlet.http.HttpServletRequest;
6464
import org.json.simple.JSONArray;
6565
import org.json.simple.JSONObject;
66-
import org.opengrok.Info;
66+
import org.opengrok.indexer.Info;
6767
import org.opengrok.indexer.configuration.Group;
6868
import org.opengrok.indexer.configuration.Project;
6969
import org.opengrok.indexer.configuration.RuntimeEnvironment;

‎src/org/opensolaris/opengrok/web/constraints/PositiveDuration.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDuration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.constraints;
23+
package org.opengrok.indexer.web.constraints;
2424

2525
import javax.validation.Constraint;
2626
import javax.validation.Payload;
@@ -37,7 +37,7 @@
3737
@Retention(RetentionPolicy.RUNTIME)
3838
public @interface PositiveDuration {
3939

40-
String message() default "{org.opensolaris.opengrok.web.constraints.PositiveDuration.message}";
40+
String message() default "{org.opengrok.indexer.web.constraints.PositiveDuration.message}";
4141

4242
Class<?>[] groups() default {};
4343

‎src/org/opensolaris/opengrok/web/constraints/PositiveDurationValidator.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDurationValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.constraints;
23+
package org.opengrok.indexer.web.constraints;
2424

2525
import javax.validation.ConstraintValidator;
2626
import javax.validation.ConstraintValidatorContext;

‎src/org/opensolaris/opengrok/web/messages/Message.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/messages/Message.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.messages;
23+
package org.opengrok.indexer.web.messages;
2424

2525
import com.fasterxml.jackson.core.JsonGenerator;
2626
import com.fasterxml.jackson.core.JsonParser;
@@ -32,7 +32,7 @@
3232
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
3333
import org.hibernate.validator.constraints.NotBlank;
3434
import org.hibernate.validator.constraints.NotEmpty;
35-
import org.opensolaris.opengrok.web.constraints.PositiveDuration;
35+
import org.opengrok.indexer.web.constraints.PositiveDuration;
3636

3737
import java.io.IOException;
3838
import java.time.Duration;
@@ -42,7 +42,7 @@
4242
import java.util.Set;
4343
import java.util.TreeSet;
4444

45-
import static org.opensolaris.opengrok.web.messages.MessagesContainer.MESSAGES_MAIN_PAGE_TAG;
45+
import static org.opengrok.indexer.web.messages.MessagesContainer.MESSAGES_MAIN_PAGE_TAG;
4646

4747
public class Message implements Comparable<Message> {
4848

‎src/org/opensolaris/opengrok/web/messages/MessagesContainer.java renamed to ‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/messages/MessagesContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.messages;
23+
package org.opengrok.indexer.web.messages;
2424

2525
import com.fasterxml.jackson.core.JsonGenerator;
2626
import com.fasterxml.jackson.databind.SerializerProvider;

0 commit comments

Comments
 (0)