Skip to content

Commit 19fbd90

Browse files
gsmetgsmet
committed
HV-1187 Only use Groovy 2.4.8-SNAPSHOT for JDK 9
1 parent 2aac0bf commit 19fbd90

File tree

2 files changed

+88
-25
lines changed

2 files changed

+88
-25
lines changed

‎pom.xml‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149

150150
<puppycrawl.checkstyle.version>7.1</puppycrawl.checkstyle.version>
151151

152-
<groovy.version>2.4.8-SNAPSHOT</groovy.version>
152+
<!-- Note: we use 2.4.8-SNAPSHOT for JDK 9. Remove the related lines from the jdk9 profile when upgrading to 2.4.8. -->
153+
<groovy.version>2.4.7</groovy.version>
153154

154155
<!--
155156
Do not upgrade Surefire and Failsafe to 2.19+.
@@ -972,6 +973,10 @@
972973
</activation>
973974
<properties>
974975
<maven-surefire-plugin.argLine.add-modules>--add-modules=${maven-surefire-plugin.jigsaw.modules}</maven-surefire-plugin.argLine.add-modules>
976+
<!--
977+
All these add-opens are probably not necessary for our WildFly usage but add the ones defined in
978+
https://github.com/ctomc/wildfly/commit/d8c4f55a1f900d931c224049c8a118ba4a5bcb45 to be on the safe side.
979+
-->
975980
<arquillian.javaVmArguments.add-opens>
976981
--add-opens=java.base/java.lang=ALL-UNNAMED
977982
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
@@ -988,6 +993,8 @@
988993
--add-opens=java.management/javax.management.openmbean=ALL-UNNAMED
989994
--add-opens=java.naming/javax.naming=ALL-UNNAMED
990995
</arquillian.javaVmArguments.add-opens>
996+
<!-- Use Groovy 2.4.8-SNAPSHOT for JDK 9. To be removed once 2.4.8 is officially released. -->
997+
<groovy.version>2.4.8-SNAPSHOT</groovy.version>
991998
</properties>
992999
<build>
9931000
<pluginManagement>
@@ -1006,6 +1013,86 @@
10061013
</plugins>
10071014
</pluginManagement>
10081015
</build>
1016+
<!--
1017+
Add JFrog snapshots repository for Groovy 2.4.8-SNAPSHOT.
1018+
To be removed once 2.4.8 is officially released.
1019+
-->
1020+
<repositories>
1021+
<!-- Use Central first -->
1022+
<repository>
1023+
<id>central</id>
1024+
<name>Maven Central</name>
1025+
<url>http://repo.maven.apache.org/maven2/</url>
1026+
<snapshots>
1027+
<enabled>false</enabled>
1028+
<updatePolicy>never</updatePolicy>
1029+
</snapshots>
1030+
</repository>
1031+
<repository>
1032+
<id>jboss-public-repository-group</id>
1033+
<name>JBoss Public Maven Repository Group</name>
1034+
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
1035+
<layout>default</layout>
1036+
<releases>
1037+
<enabled>true</enabled>
1038+
<updatePolicy>never</updatePolicy>
1039+
</releases>
1040+
<snapshots>
1041+
<enabled>true</enabled>
1042+
<updatePolicy>never</updatePolicy>
1043+
</snapshots>
1044+
</repository>
1045+
<repository>
1046+
<id>jfrog-snapshots</id>
1047+
<name>JFrog snapshots repository for Groovy</name>
1048+
<url>https://oss.jfrog.org/oss-snapshot-local/</url>
1049+
<releases>
1050+
<enabled>false</enabled>
1051+
</releases>
1052+
<snapshots>
1053+
<enabled>true</enabled>
1054+
<updatePolicy>never</updatePolicy>
1055+
</snapshots>
1056+
</repository>
1057+
</repositories>
1058+
<pluginRepositories>
1059+
<!-- Use Central first -->
1060+
<pluginRepository>
1061+
<id>central</id>
1062+
<name>Maven Central</name>
1063+
<url>http://repo.maven.apache.org/maven2/</url>
1064+
<snapshots>
1065+
<enabled>false</enabled>
1066+
<updatePolicy>never</updatePolicy>
1067+
</snapshots>
1068+
</pluginRepository>
1069+
<pluginRepository>
1070+
<id>jboss-public-repository-group</id>
1071+
<name>JBoss Public Maven Repository Group</name>
1072+
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
1073+
<layout>default</layout>
1074+
<releases>
1075+
<enabled>true</enabled>
1076+
<updatePolicy>never</updatePolicy>
1077+
</releases>
1078+
<snapshots>
1079+
<enabled>true</enabled>
1080+
<updatePolicy>never</updatePolicy>
1081+
</snapshots>
1082+
</pluginRepository>
1083+
<pluginRepository>
1084+
<id>jfrog-snapshots</id>
1085+
<name>JFrog snapshots repository for Groovy</name>
1086+
<url>https://oss.jfrog.org/oss-snapshot-local/</url>
1087+
<releases>
1088+
<enabled>false</enabled>
1089+
</releases>
1090+
<snapshots>
1091+
<enabled>true</enabled>
1092+
<updatePolicy>never</updatePolicy>
1093+
</snapshots>
1094+
</pluginRepository>
1095+
</pluginRepositories>
10091096
</profile>
10101097
</profiles>
10111098
</project>

‎settings-example.xml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@
3131
<updatePolicy>never</updatePolicy>
3232
</snapshots>
3333
</repository>
34-
<repository>
35-
<id>jfrog-snapshots</id>
36-
<name>JFrog snapshots repository for Groovy</name>
37-
<url>https://oss.jfrog.org/oss-snapshot-local/</url>
38-
<releases>
39-
<enabled>false</enabled>
40-
</releases>
41-
<snapshots>
42-
<enabled>true</enabled>
43-
<updatePolicy>never</updatePolicy>
44-
</snapshots>
45-
</repository>
4634
</repositories>
4735
<pluginRepositories>
4836
<!-- Use Central first -->
@@ -69,18 +57,6 @@
6957
<updatePolicy>never</updatePolicy>
7058
</snapshots>
7159
</pluginRepository>
72-
<pluginRepository>
73-
<id>jfrog-snapshots</id>
74-
<name>JFrog snapshots repository for Groovy</name>
75-
<url>https://oss.jfrog.org/oss-snapshot-local/</url>
76-
<releases>
77-
<enabled>false</enabled>
78-
</releases>
79-
<snapshots>
80-
<enabled>true</enabled>
81-
<updatePolicy>never</updatePolicy>
82-
</snapshots>
83-
</pluginRepository>
8460
</pluginRepositories>
8561
</profile>
8662
</profiles>

0 commit comments

Comments
 (0)