File tree Expand file tree Collapse file tree 7 files changed +16
-11
lines changed Expand file tree Collapse file tree 7 files changed +16
-11
lines changed Original file line number Diff line number Diff line change 94
94
<groupId >${project.groupId} </groupId >
95
95
<artifactId >netty-transport-native-epoll</artifactId >
96
96
<version >${project.version} </version >
97
- <classifier >${os.detected .classifier} </classifier >
97
+ <classifier >${epoll .classifier} </classifier >
98
98
<scope >compile</scope >
99
99
<optional >true</optional >
100
100
</dependency >
Original file line number Diff line number Diff line change 81
81
<dependency >
82
82
<groupId >${project.groupId} </groupId >
83
83
<artifactId >netty-tcnative</artifactId >
84
- <classifier >${os.detected .classifier} </classifier >
84
+ <classifier >${tcnative .classifier} </classifier >
85
85
</dependency >
86
86
<dependency >
87
87
<groupId >org.eclipse.jetty.npn</groupId >
Original file line number Diff line number Diff line change 47
47
<dependency >
48
48
<groupId >${project.groupId} </groupId >
49
49
<artifactId >netty-tcnative</artifactId >
50
- <classifier >${os.detected .classifier} </classifier >
50
+ <classifier >${tcnative .classifier} </classifier >
51
51
<optional >true</optional >
52
52
</dependency >
53
53
<dependency >
Original file line number Diff line number Diff line change 68
68
<groupId >${project.groupId} </groupId >
69
69
<artifactId >netty-transport-native-epoll</artifactId >
70
70
<version >${project.version} </version >
71
- <classifier >linux- ${epoll.arch } </classifier >
71
+ <classifier >${epoll.classifier } </classifier >
72
72
</dependency >
73
73
<dependency >
74
74
<groupId >junit</groupId >
Original file line number Diff line number Diff line change 149
149
Release process must be performed on linux-x86_64.
150
150
</regexMessage >
151
151
<property >os.detected.classifier</property >
152
- <regex >^linux-x86_64$</regex >
152
+ <regex >^linux-x86_64(\\-fedora)? $</regex >
153
153
</requireProperty >
154
154
<requireFilesContent >
155
155
<message >
602
602
<argLine .bootcp>-Xbootclasspath/p:${jetty.alpn.path} </argLine .bootcp>
603
603
<argLine .leak>-D_</argLine .leak> <!-- Overridden when 'leak' profile is active -->
604
604
<argLine .coverage>-D_</argLine .coverage> <!-- Overridden when 'coverage' profile is active -->
605
+ <!-- Configure the os-maven-plugin extension to expand the classifier on -->
606
+ <!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
607
+ <os .detection.classifierWithLikes>fedora</os .detection.classifierWithLikes>
608
+ <tcnative .classifier>${os.detected.classifier} </tcnative .classifier>
609
+ <epoll .classifier>${os.detected.name} -${os.detected.arch} </epoll .classifier>
605
610
</properties >
606
611
607
612
<modules >
691
696
<dependency >
692
697
<groupId >${project.groupId} </groupId >
693
698
<artifactId >netty-tcnative</artifactId >
694
- <version >1.1.33.Fork6 </version >
695
- <classifier >${os.detected .classifier} </classifier >
699
+ <version >1.1.33.Fork7 </version >
700
+ <classifier >${tcnative .classifier} </classifier >
696
701
<scope >compile</scope >
697
702
<optional >true</optional >
698
703
</dependency >
937
942
<extension >
938
943
<groupId >kr.motd.maven</groupId >
939
944
<artifactId >os-maven-plugin</artifactId >
940
- <version >1.2.3 .Final</version >
945
+ <version >1.4.0 .Final</version >
941
946
</extension >
942
947
</extensions >
943
948
Original file line number Diff line number Diff line change 52
52
<dependency >
53
53
<groupId >${project.groupId} </groupId >
54
54
<artifactId >netty-tcnative</artifactId >
55
- <classifier >${os.detected .classifier} </classifier >
55
+ <classifier >${tcnative .classifier} </classifier >
56
56
<optional >true</optional >
57
57
</dependency >
58
58
Original file line number Diff line number Diff line change 51
51
<dependency >
52
52
<groupId >${project.groupId} </groupId >
53
53
<artifactId >netty-tcnative</artifactId >
54
- <classifier >${os.detected .classifier} </classifier >
54
+ <classifier >${tcnative .classifier} </classifier >
55
55
<scope >test</scope >
56
56
</dependency >
57
57
</dependencies >
105
105
<goal >jar</goal >
106
106
</goals >
107
107
<configuration >
108
- <classifier >${os.detected .classifier} </classifier >
108
+ <classifier >${epoll .classifier} </classifier >
109
109
</configuration >
110
110
</execution >
111
111
</executions >
You can’t perform that action at this time.
0 commit comments