Skip to content

Commit dd50bfe

Browse files
maigovannonmaigovannon
committed
Changing Java25 Micronaut and Websocket Flex samples to bytecode java21 since java25 is not yet stable in Micronaut and Websocket Jetty ecosystem.
1 parent da44fe8 commit dd50bfe

File tree

2 files changed

+83
-28
lines changed

2 files changed

+83
-28
lines changed

‎flexible/java-25/micronaut-helloworld/pom.xml‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<maven.compiler.target>21</maven.compiler.target>
3535
<maven.compiler.source>21</maven.compiler.source>
3636
<micronaut.version>3.10.3</micronaut.version>
37+
<jacoco.agent.argLine>${argLine}</jacoco.agent.argLine>
3738
</properties>
3839

3940
<dependencies>
@@ -86,7 +87,7 @@
8687
<plugin>
8788
<groupId>com.google.cloud.tools</groupId>
8889
<artifactId>appengine-maven-plugin</artifactId>
89-
<version>2.8.0</version>
90+
<version>2.8.3</version>
9091
<configuration>
9192
<projectId>GCLOUD_CONFIG</projectId>
9293
<version>micronaut-helloworld</version>
@@ -95,7 +96,7 @@
9596
<plugin>
9697
<groupId>org.apache.maven.plugins</groupId>
9798
<artifactId>maven-shade-plugin</artifactId>
98-
<version>3.5.1</version>
99+
<version>3.5.2</version>
99100
<executions>
100101
<execution>
101102
<phase>package</phase>
@@ -116,7 +117,7 @@
116117
<plugin>
117118
<groupId>org.codehaus.mojo</groupId>
118119
<artifactId>exec-maven-plugin</artifactId>
119-
<version>3.1.1</version>
120+
<version>3.2.0</version>
120121
<configuration>
121122
<executable>java</executable>
122123
<arguments>
@@ -131,7 +132,7 @@
131132
</plugin>
132133
<plugin>
133134
<artifactId>maven-surefire-plugin</artifactId>
134-
<version>3.2.5</version>
135+
<version>3.2.2</version>
135136
</plugin>
136137

137138
<plugin>
@@ -166,23 +167,41 @@
166167
<compilerArgs>
167168
<arg>-parameters</arg>
168169
</compilerArgs>
169-
<annotationProcessorPaths>
170-
<path>
171-
<groupId>io.micronaut</groupId>
172-
<artifactId>micronaut-inject-java</artifactId>
173-
<version>${micronaut.version}</version>
174-
</path>
175-
<path>
176-
<groupId>io.micronaut</groupId>
177-
<artifactId>micronaut-validation</artifactId>
178-
<version>${micronaut.version}</version>
179-
</path>
180-
</annotationProcessorPaths>
181-
</configuration>
170+
<annotationProcessorPaths>
171+
<path>
172+
<groupId>io.micronaut</groupId>
173+
<artifactId>micronaut-inject-java</artifactId>
174+
<version>${micronaut.version}</version>
175+
</path>
176+
<path>
177+
<groupId>io.micronaut</groupId>
178+
<artifactId>micronaut-validation</artifactId>
179+
<version>${micronaut.version}</version>
180+
</path>
181+
</annotationProcessorPaths> </configuration>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
<plugin>
186+
<groupId>org.jacoco</groupId>
187+
<artifactId>jacoco-maven-plugin</artifactId>
188+
<version>0.8.12</version>
189+
<executions>
190+
<execution>
191+
<goals>
192+
<goal>prepare-agent</goal>
193+
</goals>
194+
</execution>
195+
<execution>
196+
<id>report</id>
197+
<phase>prepare-package</phase>
198+
<goals>
199+
<goal>report</goal>
200+
</goals>
182201
</execution>
183202
</executions>
184203
</plugin>
185204
</plugins>
186205

187206
</build>
188-
</project>
207+
</project>

‎flexible/java-25/websocket-jetty/pom.xml‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
</parent>
3535

3636
<properties>
37-
<maven.compiler.target>25</maven.compiler.target>
38-
<maven.compiler.source>25</maven.compiler.source>
37+
<maven.compiler.target>21</maven.compiler.target>
38+
<maven.compiler.source>21</maven.compiler.source>
3939
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
4040
<jetty.version>9.4.57.v20241219</jetty.version>
4141
<spring.boot.version>2.7.18</spring.boot.version>
@@ -63,7 +63,6 @@
6363
<groupId>org.eclipse.jetty</groupId>
6464
<artifactId>jetty-webapp</artifactId>
6565
<version>${jetty.version}</version>
66-
<type>jar</type>
6766
</dependency>
6867
<dependency>
6968
<groupId>org.eclipse.jetty</groupId>
@@ -75,20 +74,34 @@
7574
<artifactId>jetty-annotations</artifactId>
7675
<version>${jetty.version}</version>
7776
</dependency>
78-
<!-- extra explicit dependency needed because there is a JSP in the sample-->
7977
<dependency>
8078
<groupId>org.eclipse.jetty</groupId>
8179
<artifactId>apache-jsp</artifactId>
8280
<version>${jetty.version}</version>
83-
<classifier>nolog</classifier>
8481
</dependency>
8582
<dependency>
86-
<groupId>javax.servlet</groupId>
87-
<artifactId>javax.servlet-api</artifactId>
88-
<version>4.0.1</version>
83+
<groupId>jakarta.servlet.jsp.jstl</groupId>
84+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
85+
<version>2.0.0</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.glassfish.web</groupId>
89+
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
90+
<version>2.0.0</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>jakarta.servlet</groupId>
94+
<artifactId>jakarta.servlet-api</artifactId>
95+
<version>5.0.0</version>
8996
<type>jar</type>
9097
<scope>provided</scope>
9198
</dependency>
99+
<dependency>
100+
<groupId>jakarta.websocket</groupId>
101+
<artifactId>jakarta.websocket-api</artifactId>
102+
<version>2.1.1</version>
103+
<scope>provided</scope>
104+
</dependency>
92105
<!-- To run websockets client -->
93106
<dependency>
94107
<groupId>org.eclipse.jetty.websocket</groupId>
@@ -100,14 +113,18 @@
100113
<groupId>org.eclipse.jetty.websocket</groupId>
101114
<artifactId>websocket-server</artifactId>
102115
<version>${jetty.version}</version>
103-
<scope>provided</scope>
104116
</dependency>
105117
<dependency>
106118
<groupId>org.eclipse.jetty.websocket</groupId>
107119
<artifactId>websocket-servlet</artifactId>
108120
<version>${jetty.version}</version>
109121
<scope>provided</scope>
110122
</dependency>
123+
<dependency>
124+
<groupId>org.eclipse.jetty.websocket</groupId>
125+
<artifactId>websocket-servlet</artifactId>
126+
<version>${jetty.version}</version>
127+
</dependency>
111128
<dependency>
112129
<groupId>com.google.guava</groupId>
113130
<artifactId>guava</artifactId>
@@ -145,7 +162,7 @@
145162
<plugin>
146163
<groupId>com.google.cloud.tools</groupId>
147164
<artifactId>appengine-maven-plugin</artifactId>
148-
<version>2.8.0</version>
165+
<version>2.8.3</version>
149166
<configuration>
150167
<projectId>GCLOUD_CONFIG</projectId>
151168
<version>GCLOUD_CONFIG</version>
@@ -203,6 +220,25 @@
203220
</execution>
204221
</executions>
205222
</plugin>
223+
<plugin>
224+
<groupId>org.jacoco</groupId>
225+
<artifactId>jacoco-maven-plugin</artifactId>
226+
<version>0.8.14</version>
227+
<executions>
228+
<execution>
229+
<goals>
230+
<goal>prepare-agent</goal>
231+
</goals>
232+
</execution>
233+
<execution>
234+
<id>report</id>
235+
<phase>prepare-package</phase>
236+
<goals>
237+
<goal>report</goal>
238+
</goals>
239+
</execution>
240+
</executions>
241+
</plugin>
206242
</plugins>
207243
</build>
208244
</project>

0 commit comments

Comments
 (0)