Skip to content

Commit e75b910

Browse files
author
Vladimir Kotal
committed
Merge branch 'Orviss-suggester_java9plus_fix'
2 parents 00ed24f + 720c003 commit e75b910

File tree

3 files changed

+33
-25
lines changed

3 files changed

+33
-25
lines changed

opengrok-indexer/pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -386,28 +386,4 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
386386
</plugins>
387387
</build>
388388

389-
<profiles>
390-
<profile>
391-
<id>java9plus</id>
392-
<activation>
393-
<jdk>[9,10]</jdk>
394-
</activation>
395-
<build>
396-
<plugins>
397-
<plugin>
398-
<groupId>org.apache.maven.plugins</groupId>
399-
<artifactId>maven-surefire-plugin</artifactId>
400-
<configuration>
401-
<argLine>
402-
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
403-
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
404-
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
405-
</argLine>
406-
</configuration>
407-
</plugin>
408-
</plugins>
409-
</build>
410-
</profile>
411-
</profiles>
412-
413389
</project>

opengrok-web/pom.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,39 @@
136136
<path>/${project.build.finalName}</path>
137137
</configuration>
138138
</plugin>
139+
140+
<plugin>
141+
<groupId>org.apache.maven.plugins</groupId>
142+
<artifactId>maven-surefire-plugin</artifactId>
143+
<configuration>
144+
<argLine>${surefireArgLine}</argLine>
145+
</configuration>
146+
</plugin>
139147
</plugins>
140148
</build>
141149

150+
<profiles>
151+
<profile>
152+
<id>java9plus</id>
153+
<activation>
154+
<jdk>[9,11]</jdk>
155+
</activation>
156+
<build>
157+
<plugins>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-surefire-plugin</artifactId>
161+
<configuration>
162+
<argLine>
163+
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
164+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
165+
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
166+
</argLine>
167+
</configuration>
168+
</plugin>
169+
</plugins>
170+
</build>
171+
</profile>
172+
</profiles>
173+
142174
</project>

suggester/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<profile>
109109
<id>java9plus</id>
110110
<activation>
111-
<jdk>[9,10]</jdk>
111+
<jdk>[9,11]</jdk>
112112
</activation>
113113
<build>
114114
<plugins>

0 commit comments

Comments
 (0)