[Git][java-team/undertow][upstream] New upstream version 2.2.14
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sat Dec 18 23:35:14 GMT 2021
Markus Koschany pushed to branch upstream at Debian Java Maintainers / undertow
Commits:
db2b5d02 by Markus Koschany at 2021-12-19T00:28:01+01:00
New upstream version 2.2.14
- - - - -
23 changed files:
- benchmarks/pom.xml
- core/pom.xml
- coverage-report/pom.xml
- dist/pom.xml
- examples/pom.xml
- + jakarta/examples/pom.xml
- + jakarta/pom.xml
- + jakarta/servlet/pom.xml
- + jakarta/websockets-jsr/pom.xml
- − jakartaee9/pom.xml
- − jakartaee9/src/main/java/io/undertow/jakartaee9/ArtifactNameTransformer.java
- − jakartaee9/src/main/java/io/undertow/jakartaee9/JakartaEE9Installer.java
- − jakartaee9/src/main/java/io/undertow/jakartaee9/JakartaEE9Transformer.java
- − jakartaee9/src/main/java/io/undertow/jakartaee9/PomTransformer.java
- − jakartaee9/src/main/java/io/undertow/jakartaee9/TransformConstants.java
- − jakartaee9/src/main/java/io/undertow/jakartaee9/UndertowJakartaEE9Logger.java
- − jakartaee9/src/main/resources/META-INF/services/org.wildfly.transformer.TransformerFactory
- − jakartaee9/src/main/resources/Version.properties
- karaf/pom.xml
- parser-generator/pom.xml
- pom.xml
- servlet/pom.xml
- websockets-jsr/pom.xml
Changes:
=====================================
benchmarks/pom.xml
=====================================
@@ -25,11 +25,11 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<artifactId>undertow-benchmarks</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Benchmarks</name>
=====================================
core/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Core</name>
=====================================
coverage-report/pom.xml
=====================================
@@ -3,7 +3,7 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<artifactId>undertow-coverage-report</artifactId>
<name>Undertow Test Coverage Report</name>
=====================================
dist/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-dist</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow: Distribution</name>
=====================================
examples/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-examples</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Examples</name>
=====================================
jakarta/examples/pom.xml
=====================================
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2021 Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-parent-jakarta</artifactId>
+ <version>2.2.14.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>undertow-examples-jakarta</artifactId>
+ <name>Undertow Examples - Jakarta Variant</name>
+
+ <properties>
+ <jakarta.transformer.input.dir>${project.basedir}/../../examples</jakarta.transformer.input.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-websockets-jsr-jakarta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>undertow-examples</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>io.undertow.examples.Runner</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-jar</argument>
+ <argument>target/${project.build.finalName}.jar</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-tools-mvn</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
=====================================
jakarta/pom.xml
=====================================
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2021 Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-parent</artifactId>
+ <version>2.2.14.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>undertow-parent-jakarta</artifactId>
+ <name>Undertow Jakarta Parent</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <spotbugs.exclude.filter.file>../../spotbugs-exclude.xml</spotbugs.exclude.filter.file>
+ </properties>
+
+ <modules>
+ <module>examples</module>
+ <module>servlet</module>
+ <module>websockets-jsr</module>
+ </modules>
+
+</project>
=====================================
jakarta/servlet/pom.xml
=====================================
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2021 Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-parent-jakarta</artifactId>
+ <version>2.2.14.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>undertow-servlet-jakarta</artifactId>
+ <version>2.2.14.Final</version>
+ <name>Undertow Servlet - Jakarta Variant</name>
+
+ <properties>
+ <jakarta.transformer.input.dir>${project.basedir}/../../servlet</jakarta.transformer.input.dir>
+ <test.level>INFO</test.level>
+ <ajp>false</ajp>
+ <proxy>false</proxy>
+ <dump>false</dump>
+ <test.ipv6>false</test.ipv6>
+ <bufferSize>8192</bufferSize>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.openssl</groupId>
+ <artifactId>wildfly-openssl</artifactId>
+ <version>${version.org.wildfly.openssl}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>target/generated-test-resources/transformed</directory>
+ </testResource>
+ <testResource>
+ <directory>target/generated-test-sources/transformed</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.bitstrings.maven.plugins</groupId>
+ <artifactId>dependencypath-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>set-all</id>
+ <goals>
+ <goal>set</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ io.undertow.servlet*;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ javax.annotation.security;version="[1.2,3)",
+ !sun.*,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <classifier>tests</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.ajp>${ajp}</test.ajp>
+ <test.proxy>${proxy}</test.proxy>
+ <openssl>false</openssl>
+ <test.openssl>${openssl}</test.openssl>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ <org.wildfly.openssl.path>${org.wildfly.openssl.path}</org.wildfly.openssl.path>
+ </systemPropertyVariables>
+ <argLine>${jacoco.agent.argLine} ${surefire.system.args}</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-tools-mvn</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <org.wildfly.openssl.path>/usr/local/opt/openssl/lib</org.wildfly.openssl.path>
+ </properties>
+ </profile>
+ <profile>
+ <id>proxy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>proxy</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.proxy>true</test.proxy>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-proxy-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>proxy-ajp</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.ajp>true</test.ajp>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-ajp-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>proxy-https</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.https>true</test.https>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-https-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>proxy-h2</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.h2>true</test.h2>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-h2c-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>proxy-h2-upgrade</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.h2c-upgrade>true</test.h2c-upgrade>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-h2c-upgrade-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>proxy-h2c</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <systemPropertyVariables>
+ <test.h2c>true</test.h2c>
+ <test.dump>${dump}</test.dump>
+ <test.bufferSize>${bufferSize}</test.bufferSize>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager
+ </java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ </systemPropertyVariables>
+ <reportsDirectory>${project.build.directory}/surefire-h2c-reports</reportsDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
=====================================
jakarta/websockets-jsr/pom.xml
=====================================
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2021 Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-parent-jakarta</artifactId>
+ <version>2.2.14.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>undertow-websockets-jsr-jakarta</artifactId>
+ <name>Undertow WebSockets JSR356 implementations - Jakarta Variant</name>
+
+ <properties>
+ <jakarta.transformer.input.dir>${project.basedir}/../../websockets-jsr</jakarta.transformer.input.dir>
+ <test.level>INFO</test.level>
+ <serverPort>7777</serverPort>
+ <proxy>false</proxy>
+ <test.ipv6>false</test.ipv6>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.websocket</groupId>
+ <artifactId>jakarta.websocket-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.openssl</groupId>
+ <artifactId>wildfly-openssl</artifactId>
+ <version>${version.org.wildfly.openssl}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>target/generated-test-resources/transformed</directory>
+ </testResource>
+ <testResource>
+ <directory>target/generated-test-sources/transformed</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ io.undertow.websockets.jsr*;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ !sun.*,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <enableAssertions>true</enableAssertions>
+ <runOrder>reversealphabetical</runOrder>
+ <skip>${skipWebSocketTests}</skip>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <proxy>${proxy}</proxy>
+ <default.server.address>localhost</default.server.address>
+ <default.server.port>7777</default.server.port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+ <test.level>${test.level}</test.level>
+ <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
+ <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
+ <org.wildfly.openssl.path>${org.wildfly.openssl.path}</org.wildfly.openssl.path>
+ </systemPropertyVariables>
+ <argLine>${surefire.system.args} ${jacoco.agent.argLine}</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-tools-mvn</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <move file="target/generated-resources/transformed/META-INF/services/javax.websocket.ContainerProvider"
+ tofile="target/generated-resources/transformed/META-INF/services/jakarta.websocket.ContainerProvider"/>
+ <move file="target/generated-resources/transformed/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator"
+ tofile="target/generated-resources/transformed/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <org.wildfly.openssl.path>/usr/local/opt/openssl/lib</org.wildfly.openssl.path>
+ </properties>
+ </profile>
+ <profile>
+ <id>spdy-no-tests</id>
+ <activation>
+ <property>
+ <name>test.spdy</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipWebSocketTests>true</skipWebSocketTests>
+ </properties>
+ </profile>
+ <profile>
+ <id>h2-no-tests</id>
+ <activation>
+ <property>
+ <name>test.h2</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipWebSocketTests>true</skipWebSocketTests>
+ </properties>
+ </profile>
+ <profile>
+ <id>autobahn</id>
+ <activation>
+ <property>
+ <name>autobahn</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>me.normanmaurer.maven.autobahntestsuite</groupId>
+ <artifactId>autobahntestsuite-maven-plugin</artifactId>
+ <version>0.1.3</version>
+ <configuration>
+ <host>127.0.0.1</host>
+ <port>7777</port>
+ <mainClass>io.undertow.websockets.jsr.test.autobahn.AnnotatedAutobahnServer</mainClass>
+ <cases>
+ <case>*</case>
+ </cases>
+ <excludeCases></excludeCases>
+ <failOnNonStrict>false</failOnNonStrict>
+ <generateJUnitXmlReports>true</generateJUnitXmlReports>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>fuzzingclient</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
=====================================
jakartaee9/pom.xml deleted
=====================================
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2020 Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
- </parent>
-
- <groupId>io.undertow</groupId>
- <artifactId>undertow-jakartaee9</artifactId>
- <version>2.2.13.Final</version>
-
- <name>Undertow Jakarta EE9</name>
-
- <properties>
- <version.jakarta.servlet-api>5.0.0</version.jakarta.servlet-api>
- <version.jakarta.websocket-client-api>2.0.0</version.jakarta.websocket-client-api>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-examples</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly.extras.batavia</groupId>
- <artifactId>transformer-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly.extras.batavia</groupId>
- <artifactId>transformer-impl-eclipse</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-invoker</artifactId>
- <version>3.0.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <!-- pom files -->
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-examples</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <!-- jar files -->
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-examples</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <outputDirectory>${project.basedir}/target/input</outputDirectory>
- </artifactItem>
- <!-- source files -->
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <classifier>sources</classifier>
- <outputDirectory>${project.basedir}/target/output</outputDirectory>
- <destFileName>undertow-servlet-jakartaee9-${project.version}-sources.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-examples</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <classifier>sources</classifier>
- <outputDirectory>${project.basedir}/target/output</outputDirectory>
- <destFileName>undertow-examples-jakartaee9-${project.version}-sources.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <classifier>sources</classifier>
- <outputDirectory>${project.basedir}/target/output</outputDirectory>
- <destFileName>undertow-websockets-jsr-jakartaee9-${project.version}-sources.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>transform-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>io.undertow.jakartaee9.JakartaEE9Transformer</mainClass>
- </configuration>
- </execution>
- <execution>
- <id>install-artifacts</id>
- <phase>install</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>io.undertow.jakartaee9.JakartaEE9Installer</mainClass>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <systemProperties>
- <systemProperty>
- <key>version.jakarta.servlet-api</key>
- <value>${version.jakarta.servlet-api}</value>
- </systemProperty>
- <systemProperty>
- <key>version.jakarta.websocket-client-api</key>
- <value>${version.jakarta.websocket-client-api}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${version.deploy.plugin}</version>
- <executions>
- <execution>
- <id>deploy-servlet-jakartaee9</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>${project.basedir}/target/output/undertow-servlet-jakartaee9-${project.version}.jar</file>
- <pomFile>${project.basedir}/target/output/undertow-servlet-jakartaee9-${project.version}.pom</pomFile>
- <sources>${project.basedir}/target/output/undertow-servlet-jakartaee9-${project.version}-sources.jar</sources>
- </configuration>
- </execution>
- <execution>
- <id>deploy-websockets-jsr-jakartaee9</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>${project.basedir}/target/output/undertow-websockets-jsr-jakartaee9-${project.version}.jar</file>
- <pomFile>${project.basedir}/target/output/undertow-websockets-jsr-jakartaee9-${project.version}.pom</pomFile>
- <sources>${project.basedir}/target/output/undertow-websockets-jsr-jakartaee9-${project.version}-sources.jar</sources>
- </configuration>
- </execution>
- <execution>
- <id>deploy-examples-jakartaee9</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>${project.basedir}/target/output/undertow-examples-jakartaee9-${project.version}.jar</file>
- <pomFile>${project.basedir}/target/output/undertow-examples-jakartaee9-${project.version}.pom</pomFile>
- <sources>${project.basedir}/target/output/undertow-examples-jakartaee9-${project.version}-sources.jar</sources>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <repositoryId>jboss-releases-repository</repositoryId>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2</url>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-
-</project>
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/ArtifactNameTransformer.java deleted
=====================================
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import static io.undertow.jakartaee9.TransformConstants.VERSION_STRING;
-
-/**
- * Parses an Jakarta EE8 compatible artifact name and transforms it into the
- * equivalent Jakarta EE9 compatible counterpart.
- *
- * @author Flavia Rainone
- */
-class ArtifactNameTransformer {
- private static final String JAKARTA_EE9_SUFFIX = "-jakartaee9";
-
- static String transformArtifactName(String fileName, String artifactType) {
- return getArtifactName(fileName, artifactType) + JAKARTA_EE9_SUFFIX;
- }
-
- static String transformArtifactFileName(String fileName, String artifactType) {
- final String outputFileSuffix = JAKARTA_EE9_SUFFIX + "-" + VERSION_STRING + "." + artifactType;
- return getArtifactName(fileName, artifactType) + outputFileSuffix;
- }
-
- static String getArtifactName(String fileName, String artifactType) {
- final String inputFileSuffix = "-" + VERSION_STRING + "." + artifactType;
- return fileName.substring(0, fileName.length() - inputFileSuffix.length());
- }
-}
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/JakartaEE9Installer.java deleted
=====================================
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.Properties;
-
-import org.apache.maven.shared.invoker.DefaultInvocationRequest;
-import org.apache.maven.shared.invoker.DefaultInvoker;
-import org.apache.maven.shared.invoker.InvocationRequest;
-import org.apache.maven.shared.invoker.Invoker;
-import org.apache.maven.shared.invoker.MavenInvocationException;
-
-import static io.undertow.jakartaee9.TransformConstants.JAR_EXTENSION;
-import static io.undertow.jakartaee9.TransformConstants.OUTPUT_DIR;
-import static io.undertow.jakartaee9.TransformConstants.POM_EXTENSION;
-import static io.undertow.jakartaee9.TransformConstants.SOURCES_EXTENSION;
-import static io.undertow.jakartaee9.UndertowJakartaEE9Logger.LOGGER;
-
-/**
- * Installs Jakarta EE9 artifacts.
- *
- * @author Flavia Rainone
- */
-public class JakartaEE9Installer {
-
- public static void main (String[] args)
- throws MavenInvocationException {
- final File[] pomFiles = OUTPUT_DIR.listFiles((File dir, String name) -> name.endsWith(POM_EXTENSION));
- if (pomFiles == null) {
- throw LOGGER.pomFilesNotFoundInOutputDir(OUTPUT_DIR.getAbsolutePath());
- }
- for (File pomFile : pomFiles) {
- final String pomFileName = pomFile.getAbsolutePath();
- final String jarFileName = pomFile.getAbsolutePath().substring(0, pomFileName.length() - POM_EXTENSION
- .length()) + JAR_EXTENSION;
- final String sourcesJarFileName = pomFile.getAbsolutePath().substring(0, pomFileName.length() - POM_EXTENSION
- .length()) + SOURCES_EXTENSION;
- LOGGER.installingFile(jarFileName, pomFile.getAbsolutePath());
-
- final Properties properties = new Properties();
- properties.put("file", jarFileName);
- properties.put("sources", sourcesJarFileName);
- properties.put("pomFile", pomFileName);
-
- final InvocationRequest request = new DefaultInvocationRequest();
- request.setGoals(Collections.singletonList("install:install-file"));
- request.setProperties(properties);
- final Invoker invoker = new DefaultInvoker();
- invoker.execute( request );
- }
- }
-}
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/JakartaEE9Transformer.java deleted
=====================================
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.wildfly.extras.transformer.TransformerFactory;
-
-import static io.undertow.jakartaee9.TransformConstants.INPUT_DIR;
-import static io.undertow.jakartaee9.TransformConstants.JAR_EXTENSION;
-import static io.undertow.jakartaee9.TransformConstants.JAR_TYPE;
-import static io.undertow.jakartaee9.TransformConstants.OUTPUT_DIR;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE9_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE9_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_VERSION;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE9_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_VERSION;
-import static io.undertow.jakartaee9.UndertowJakartaEE9Logger.LOGGER;
-
-/**
- * Transforms JakartaEE8 Undertow artifacts files into corresponding Jakarta EE9 compatible artifact files.
- *
- * @author Flavia Rainone
- */
-public class JakartaEE9Transformer {
-
- public static void main (String[] args) throws IOException {
-
- LOGGER.greeting(TransformConstants.VERSION_STRING);
- LOGGER.transformationInfo(SERVLET_SPEC_JAKARTAEE9_GROUP, SERVLET_SPEC_JAKARTAEE9_ARTIFACT,
- SERVLET_SPEC_VERSION, WEBSOCKETS_SPEC_JAKARTAEE9_GROUP, WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT,
- WEBSOCKETS_SPEC_VERSION);
-
-
- final PomTransformer pomTransformer = new PomTransformer(INPUT_DIR, OUTPUT_DIR);
- pomTransformer.transformPoms();
- final File[] inputFiles = INPUT_DIR.listFiles();
- if (inputFiles == null) {
- throw LOGGER.inputFilesNotFoundInDir(INPUT_DIR.getAbsolutePath());
- }
- for (File file : inputFiles) {
- if (file.getName().endsWith(JAR_EXTENSION)) {
- final String newFileName = ArtifactNameTransformer.transformArtifactFileName(file.getName(),
- JAR_TYPE);
- LOGGER.transformingFile(file.getName(), newFileName);
- final File generatedFile = new File(OUTPUT_DIR.getAbsolutePath() + File.separatorChar + file.getName());
- TransformerFactory.getInstance().newTransformer().build().transform(file, generatedFile);
- assert generatedFile.exists();
- final File newGeneratedFile = new File(OUTPUT_DIR.getAbsolutePath() + File.separatorChar + newFileName);
- if (!generatedFile.renameTo(newGeneratedFile)) {
- throw LOGGER.renamingFileFailed(generatedFile.getAbsolutePath(), newGeneratedFile.getAbsolutePath());
- }
- }
- }
- }
-}
\ No newline at end of file
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/PomTransformer.java deleted
=====================================
@@ -1,173 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static io.undertow.jakartaee9.ArtifactNameTransformer.getArtifactName;
-import static io.undertow.jakartaee9.ArtifactNameTransformer.transformArtifactFileName;
-import static io.undertow.jakartaee9.ArtifactNameTransformer.transformArtifactName;
-import static io.undertow.jakartaee9.TransformConstants.POM_EXTENSION;
-import static io.undertow.jakartaee9.TransformConstants.POM_TYPE;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE8_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE8_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE9_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_JAKARTAEE9_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.SERVLET_SPEC_VERSION;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE8_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE8_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_JAKARTAEE9_GROUP;
-import static io.undertow.jakartaee9.TransformConstants.WEBSOCKETS_SPEC_VERSION;
-import static io.undertow.jakartaee9.UndertowJakartaEE9Logger.LOGGER;
-
-/**
- * Transforms pom files, moving artifact dependencies from Jakarta EE8 to
- * Jakarta EE9.
- *
- * @author Flavia Rainone
- */
-class PomTransformer {
- private static final String VERSION_LINE = "\\s*<version>.*</version>\\s*";
-
- private static final String OPEN_ARTIFACT = "<artifactId>";
- private static final String CLOSE_ARTIFACT = "</artifactId>";
- private static final String SERVLET_SPEC_JAKARTAEE8_ARTIFACT_LINE = OPEN_ARTIFACT + SERVLET_SPEC_JAKARTAEE8_ARTIFACT + CLOSE_ARTIFACT;
- private static final String SERVLET_SPEC_JAKARTAEE9_ARTIFACT_LINE = OPEN_ARTIFACT + SERVLET_SPEC_JAKARTAEE9_ARTIFACT + CLOSE_ARTIFACT;
- private static final String WEBSOCKETS_SPEC_JAKARTAEE8_ARTIFACT_LINE = OPEN_ARTIFACT + WEBSOCKETS_SPEC_JAKARTAEE8_ARTIFACT + CLOSE_ARTIFACT;
- private static final String WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT_LINE = OPEN_ARTIFACT + WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT + CLOSE_ARTIFACT;
-
- private static final String OPEN_GROUP = "<groupId>";
- private static final String CLOSE_GROUP = "</groupId>";
- private static final String SERVLET_SPEC_JAKARTAEE8_GROUP_LINE = OPEN_GROUP + SERVLET_SPEC_JAKARTAEE8_GROUP + CLOSE_GROUP;
- private static final String SERVLET_SPEC_JAKARTAEE9_GROUP_LINE = OPEN_GROUP + SERVLET_SPEC_JAKARTAEE9_GROUP + CLOSE_GROUP;
- private static final String WEBSOCKETS_SPEC_JAKARTAEE8_GROUP_LINE = OPEN_GROUP + WEBSOCKETS_SPEC_JAKARTAEE8_GROUP + CLOSE_GROUP;
- private static final String WEBSOCKETS_SPEC_JAKARTAEE9_GROUP_LINE = OPEN_GROUP + WEBSOCKETS_SPEC_JAKARTAEE9_GROUP + CLOSE_GROUP;
-
- private static final String OPEN_VERSION = "<version>";
- private static final String CLOSE_VERSION = "</version>";
- private static final String SERVLET_SPEC_VERSION_LINE = OPEN_VERSION + SERVLET_SPEC_VERSION + CLOSE_VERSION;
- private static final String WEBSOCKETS_SPEC_VERSION_LINE = OPEN_VERSION + WEBSOCKETS_SPEC_VERSION + CLOSE_VERSION;
-
- private final File inputDir;
- private final File outputDir;
-
- PomTransformer(File inputDir, File outputDir) {
- this.inputDir = inputDir;
- this.outputDir = outputDir;
- if (!inputDir.exists()) {
- throw LOGGER.inputDirDoesNotExist(inputDir.getAbsolutePath());
- }
- }
-
- void transformPoms() throws IOException {
- final Map<String, String> artifactMapping = new HashMap<>();
- try (Stream<Path> paths = Files.walk(inputDir.toPath())) {
- paths.forEach((Path p) -> {
- final String fileName = p.getFileName().toString();
- if (fileName.endsWith(POM_EXTENSION)) artifactMapping.put(getArtifactName(fileName, POM_TYPE), transformArtifactName(fileName, POM_TYPE));
- });
- }
- final File[] inputFiles = inputDir.listFiles();
- if (inputFiles == null)
- throw LOGGER.inputFilesNotFoundInDir(inputDir.getCanonicalPath());
- for (File file : inputFiles) {
- if (file.getName().endsWith(POM_EXTENSION))
- transformPom(file, artifactMapping);
- }
- }
-
- private void transformPom(final File pomFile, Map<String, String> artifactMapping) throws IOException {
- // input and output file names
- final String pomFileName = pomFile.getName();
- final String transformedPomFileName = transformArtifactFileName(pomFileName,
- POM_TYPE);
- final File transformedPomFile = new File(outputDir, transformedPomFileName);
- if (!transformedPomFile.createNewFile()) {
- // if there's already a pom file, the file is from a previous build, delete it and create a new one
- if (!transformedPomFile.delete() || !transformedPomFile.createNewFile()) {
- throw LOGGER.cannotCreateOutputFile(transformedPomFile.getAbsolutePath());
- }
- }
-
- LOGGER.transformingFile(pomFileName, transformedPomFileName);
-
- // process lines
- final Stream<String> pomLines = Files.lines(pomFile.toPath());
- final Stream<String> transformedPomLines = pomLines.map(line -> transformPomLine(line, artifactMapping));
- try (Writer writer = new OutputStreamWriter(new FileOutputStream(transformedPomFile), "US-ASCII")) {
- transformedPomLines.forEachOrdered(line -> {
- if (line == null) return;
- try {
- writer.write(line);
- writer.write('\n');
- } catch (IOException e) {
- e.printStackTrace();
- System.exit(1);
- }
- });
- }
- }
-
- private boolean skipVersion;
-
- private String transformPomLine(String line, Map<String, String> artifactMapping) {
- for (Map.Entry<String, String> mappedArtifact: artifactMapping.entrySet()) {
- if (line.matches(".*" + mappedArtifact.getKey() + ".*")) {
- return line.replaceAll(mappedArtifact.getKey(), mappedArtifact.getValue());
- }
- }
- if (skipVersion) {
- skipVersion = false;
- if (line.matches(VERSION_LINE))
- return null;
- }
- if (line.contains(SERVLET_SPEC_JAKARTAEE8_GROUP_LINE)) {
- return getTabSpaces(line) + SERVLET_SPEC_JAKARTAEE9_GROUP_LINE;
- }
- if (line.contains (WEBSOCKETS_SPEC_JAKARTAEE8_GROUP_LINE)) {
- return getTabSpaces(line) + WEBSOCKETS_SPEC_JAKARTAEE9_GROUP_LINE;
- }
- if (line.contains(SERVLET_SPEC_JAKARTAEE8_ARTIFACT_LINE)) {
- final String spaces = getTabSpaces(line);
- skipVersion = true;
- return spaces + SERVLET_SPEC_JAKARTAEE9_ARTIFACT_LINE + "\n"
- + spaces + SERVLET_SPEC_VERSION_LINE;
- }
- if (line.contains(WEBSOCKETS_SPEC_JAKARTAEE8_ARTIFACT_LINE)) {
- final String spaces = getTabSpaces(line);
- skipVersion = true;
- return spaces + WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT_LINE + "\n"
- + spaces + WEBSOCKETS_SPEC_VERSION_LINE;
- }
- return line;
- }
-
- private String getTabSpaces(String inputLine) {
- return inputLine.substring(0, inputLine.indexOf('<'));
- }
-}
\ No newline at end of file
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/TransformConstants.java deleted
=====================================
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
-/**
- * Some static constants used by other classes.
- *
- * @author Flavia Rainone
- */
-class TransformConstants {
- private static final String MAVEN_PROJECT_DIR_PROPERTY = "maven.multiModuleProjectDirectory";
- private static final String JAKARTAEE9_DIR_NAME = File.separator + "jakartaee9";
- private static final String INPUT_DIR_NAME = File.separator + "target" + File.separator + "input";
- private static final String OUTPUT_DIR_NAME = File.separator + "target" + File.separator + "output";
-
- // input and output dirs
- static final File INPUT_DIR;
- static final File OUTPUT_DIR;
-
- // artifact types and extensions
- static final String JAR_TYPE = "jar";
- static final String JAR_EXTENSION = "." + JAR_TYPE;
- static final String POM_TYPE = "pom";
- static final String POM_EXTENSION = "." + POM_TYPE;
- static final String SOURCES_EXTENSION = "-sources." + JAR_TYPE;
-
- // spec versions
- private static final String SERVLET_SPEC_VERSION_PROPERTY = "version.jakarta.servlet-api";
- private static final String WEBSOCKETS_SPEC_VERSION_PROPERTY = "version.jakarta.websocket-client-api";
- static final String SERVLET_SPEC_VERSION = System.getProperty(SERVLET_SPEC_VERSION_PROPERTY);
- static final String WEBSOCKETS_SPEC_VERSION = System.getProperty(WEBSOCKETS_SPEC_VERSION_PROPERTY);
-
- // servlet spec constants
- static final String SERVLET_SPEC_JAKARTAEE8_GROUP = "org.jboss.spec.javax.servlet";
- static final String SERVLET_SPEC_JAKARTAEE9_GROUP = "jakarta.servlet";
- static final String SERVLET_SPEC_JAKARTAEE8_ARTIFACT = "jboss-servlet-api_4.0_spec";
- static final String SERVLET_SPEC_JAKARTAEE9_ARTIFACT = "jakarta.servlet-api";
-
- // websockets constants
- static final String WEBSOCKETS_SPEC_JAKARTAEE8_GROUP = "org.jboss.spec.javax.websocket";
- static final String WEBSOCKETS_SPEC_JAKARTAEE9_GROUP = "jakarta.websocket";
- static final String WEBSOCKETS_SPEC_JAKARTAEE8_ARTIFACT = "jboss-websocket-api_1.1_spec";
- static final String WEBSOCKETS_SPEC_JAKARTAEE9_ARTIFACT = "jakarta.websocket-client-api";
-
- // Undertow version
- static final String VERSION_STRING;
-
- static {
- final Properties versionProps = new Properties();
- String versionString = "(unknown)";
- try (InputStream stream = TransformConstants.class.getClassLoader().getResourceAsStream("Version.properties")) {
- if (stream != null) {
- try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
- versionProps.load(reader);
- versionString = versionProps.getProperty("version", versionString);
- }
- }
- } catch (IOException ignored) {
- }
- VERSION_STRING = versionString;
-
- String projectDirectoryPath = System.getProperty(MAVEN_PROJECT_DIR_PROPERTY);
- assert projectDirectoryPath != null;
- if (!projectDirectoryPath.endsWith(JAKARTAEE9_DIR_NAME))
- projectDirectoryPath = projectDirectoryPath + JAKARTAEE9_DIR_NAME;
- INPUT_DIR = new File(projectDirectoryPath + INPUT_DIR_NAME);
- OUTPUT_DIR = new File(projectDirectoryPath + OUTPUT_DIR_NAME);
- assert INPUT_DIR.exists();
- if (!OUTPUT_DIR.exists() && !OUTPUT_DIR.mkdir())
- throw UndertowJakartaEE9Logger.LOGGER.cannotCreateOutputDir(OUTPUT_DIR_NAME);
- }
-}
=====================================
jakartaee9/src/main/java/io/undertow/jakartaee9/UndertowJakartaEE9Logger.java deleted
=====================================
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.undertow.jakartaee9;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
-
-import static org.jboss.logging.Logger.Level.INFO;
-
-/**
- * Logger for Jakarta EE9 module.
- *
- * @author Flavia Rainone
- */
- at MessageLogger(projectCode = "Undertow Jakarta EE9")
-interface UndertowJakartaEE9Logger extends BasicLogger {
- UndertowJakartaEE9Logger LOGGER = Logger.getMessageLogger(
- UndertowJakartaEE9Logger.class, "io.undertow.jakartaee9");
-
- // Greeting
- @LogMessage(level = INFO)
- @Message(value = "Undertow Jakarta EE9 Transformer Version %s")
- void greeting(String version);
-
- @LogMessage(level = INFO)
- @Message(value = "Dependencies that will be used in the new generated modules:\n\t%s:%s-%s\n\t%s:%s-%s")
- void transformationInfo (String servletDependencyGroupId, String servletDependencyArtifactId, String servletDependencyVersion,
- String websocketsDependencyGroupId, String websocketsDependencyArtifactId, String websocketsDependencyVersion);
-
- @LogMessage(level = INFO)
- @Message(value = "Transforming %s into %s")
- void transformingFile (String fileName, String newFileName);
-
- @LogMessage(level = INFO)
- @Message(value = "Installing artifact file %s with pom %s")
- void installingFile (String artifactFileName, String pomFileName);
-
- @Message(id = 0, value = "Pom files not present in output dir %s")
- IllegalStateException pomFilesNotFoundInOutputDir(String outputDir);
-
- @Message(id = 1, value = "Input files not found in input dir %s")
- IllegalStateException inputFilesNotFoundInDir(String inputDir);
-
- @Message(id = 2, value = "Renaming of file %s to %s failed")
- RuntimeException renamingFileFailed(String originalName, String newName);
-
- @Message(id = 3, value = "Creation of output dir %s failed")
- RuntimeException cannotCreateOutputDir(String outputDir);
-
- @Message(id = 4, value = "Creation of file %s failed")
- RuntimeException cannotCreateOutputFile(String outputFile);
-
- @Message(id = 5, value = "Input dir does not exist: %s")
- IllegalStateException inputDirDoesNotExist(String inputDirPath);
-}
=====================================
jakartaee9/src/main/resources/META-INF/services/org.wildfly.transformer.TransformerFactory deleted
=====================================
@@ -1 +0,0 @@
-org.wildfly.transformer.asm.TransformerFactoryImpl
\ No newline at end of file
=====================================
jakartaee9/src/main/resources/Version.properties deleted
=====================================
@@ -1 +0,0 @@
-version=${project.version}
=====================================
karaf/pom.xml
=====================================
@@ -23,12 +23,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>karaf</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Karaf feature</name>
=====================================
parser-generator/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parser-generator</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Parser Generator</name>
<description>An annotation processor that is used to generate the HTTP parser</description>
=====================================
pom.xml
=====================================
@@ -28,7 +28,7 @@
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow</name>
<description>Undertow</description>
@@ -62,6 +62,10 @@
-->
<version.com.h2database>1.4.200</version.com.h2database>
<version.easymock>4.2</version.easymock>
+ <version.jakarta.annotation.jakarta-annotation-api>2.0.0</version.jakarta.annotation.jakarta-annotation-api>
+ <version.jakarta.servlet.jakarta-servlet-api>5.0.0</version.jakarta.servlet.jakarta-servlet-api>
+ <version.jakarta.websocket.jakarta-websocket-api>2.0.0</version.jakarta.websocket.jakarta-websocket-api>
+ <version.org.wildfly.extras.batavia>1.0.11.Final</version.org.wildfly.extras.batavia>
<version.junit>4.13</version.junit>
<version.netty>4.1.50.Final</version.netty>
<version.org.apache.directory.server>2.0.0-M15</version.org.apache.directory.server>
@@ -83,6 +87,9 @@
<version.org.jacoco>0.7.9</version.org.jacoco>
<jacoco.agent.argLine></jacoco.agent.argLine>
+ <!-- Spotbugs properties -->
+ <spotbugs.exclude.filter.file>../spotbugs-exclude.xml</spotbugs.exclude.filter.file>
+
<!-- Surefire args -->
<surefire.jpda.args/>
<surefire.system.args>-ea ${surefire.jpda.args} -Xmx1024m</surefire.system.args>
@@ -103,8 +110,6 @@
<version.bundle.plugin>5.1.1</version.bundle.plugin>
<version.jmh>1.21</version.jmh>
-
- <version.org.wildfly.extras.batavia>1.0.4.Final</version.org.wildfly.extras.batavia>
</properties>
<modules>
@@ -114,7 +119,7 @@
<module>examples</module>
<module>websockets-jsr</module>
<module>benchmarks</module>
- <module>jakartaee9</module>
+ <module>jakarta</module>
</modules>
<build>
@@ -213,7 +218,7 @@
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${version.com.github.spotbugs-maven-plugin}</version>
<configuration>
- <excludeFilterFile>../spotbugs-exclude.xml</excludeFilterFile>
+ <excludeFilterFile>${spotbugs.exclude.filter.file}</excludeFilterFile>
</configuration>
<executions>
<execution>
@@ -274,6 +279,30 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>${version.bundle.plugin}</version>
</plugin>
+ <plugin>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-tools-mvn</artifactId>
+ <version>${version.org.wildfly.extras.batavia}</version>
+ <executions>
+ <execution>
+ <id>transform-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>transform-sources</goal>
+ </goals>
+ <configuration>
+ <source-project>${jakarta.transformer.input.dir}</source-project>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-impl-eclipse</artifactId>
+ <version>${version.org.wildfly.extras.batavia}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -305,7 +334,7 @@
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-examples-jakartaee9</artifactId>
+ <artifactId>undertow-examples-jakarta</artifactId>
<version>${project.version}</version>
</dependency>
@@ -323,10 +352,17 @@
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakartaee9</artifactId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
@@ -343,7 +379,7 @@
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr-jakartaee9</artifactId>
+ <artifactId>undertow-websockets-jsr-jakarta</artifactId>
<version>${project.version}</version>
</dependency>
@@ -353,8 +389,6 @@
<version>${project.version}</version>
</dependency>
-
-
<!-- External Dependencies -->
<dependency>
@@ -363,6 +397,24 @@
<version>${version.io.undertow.build.checkstyle-config}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${version.jakarta.servlet.jakarta-servlet-api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${version.jakarta.annotation.jakarta-annotation-api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.websocket</groupId>
+ <artifactId>jakarta.websocket-api</artifactId>
+ <version>${version.jakarta.websocket.jakarta-websocket-api}</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.classfilewriter</groupId>
<artifactId>jboss-classfilewriter</artifactId>
=====================================
servlet/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow Servlet</name>
=====================================
websockets-jsr/pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-parent</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
</parent>
<groupId>io.undertow</groupId>
<artifactId>undertow-websockets-jsr</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.14.Final</version>
<name>Undertow WebSockets JSR356 implementations</name>
View it on GitLab: https://salsa.debian.org/java-team/undertow/-/commit/db2b5d02c068509c66ad0ab1cdaf291eb9191ff5
--
View it on GitLab: https://salsa.debian.org/java-team/undertow/-/commit/db2b5d02c068509c66ad0ab1cdaf291eb9191ff5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20211218/0b8634c6/attachment.htm>
More information about the pkg-java-commits
mailing list