Skip to content

Commit

Permalink
Move h2spec exec to a profile (#12209)
Browse files Browse the repository at this point in the history
* move h2spec plugin exec to a profile

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
olamy authored Aug 30, 2024
1 parent 4755fa3 commit e1cd1f5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 29 deletions.
53 changes: 30 additions & 23 deletions jetty-core/jetty-http2/jetty-http2-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,40 @@
--add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>h2spec-maven-plugin</artifactId>
<version>1.0.12</version>
<configuration>
<mainClass>org.eclipse.jetty.http2.tests.H2SpecServer</mainClass>
<skip>${h2spec.skip}</skip>
<junitPackage>org.eclipse.jetty.h2spec</junitPackage>
<skipNoDockerAvailable>true</skipNoDockerAvailable>
<excludeSpecs>
<excludeSpec>3.5 - Sends invalid connection preface</excludeSpec>
</excludeSpecs>
</configuration>
<executions>
<execution>
<id>h2spec</id>
<goals>
<goal>h2spec</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>h2spec</id>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>h2spec-maven-plugin</artifactId>
<version>1.0.13</version>
<configuration>
<mainClass>org.eclipse.jetty.http2.tests.H2SpecServer</mainClass>
<skip>${h2spec.skip}</skip>
<junitPackage>org.eclipse.jetty.h2spec</junitPackage>
<skipNoDockerAvailable>true</skipNoDockerAvailable>
<excludeSpecs>
<excludeSpec>3.5 - Sends invalid connection preface</excludeSpec>
</excludeSpecs>
</configuration>
<executions>
<execution>
<id>h2spec</id>
<goals>
<goal>h2spec</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>run-spec-server</id>
<build>
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
<gson.version>2.11.0</gson.version>
<guava.version>33.2.1-jre</guava.version>
<guice.version>7.0.0</guice.version>
<h2spec.maven.plugin.version>1.0.13</h2spec.maven.plugin.version>
<hamcrest.version>2.2</hamcrest.version>
<hazelcast.version>5.4.0</hazelcast.version>
<hibernate.search.version>7.1.1.Final</hibernate.search.version>
Expand Down Expand Up @@ -1670,11 +1669,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>h2spec-maven-plugin</artifactId>
<version>${h2spec.maven.plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down

0 comments on commit e1cd1f5

Please sign in to comment.