Skip to content

Commit

Permalink
Merge pull request mvnpm#4513 from ia3andy/fix-it
Browse files Browse the repository at this point in the history 
Disable composite test in IT and Re-add provided deps
  • Loading branch information
@phillip-kruger
phillip-kruger authored Feb 13, 2024
2 parents 36d8c98 + dd6c4c7 commit f94b341
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 33 deletions.
35 changes: 35 additions & 0 deletions .locker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,176 +15,211 @@
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>autocomplete</artifactId>
<version>6.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>commands</artifactId>
<version>6.3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-javascript</artifactId>
<version>6.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-json</artifactId>
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-xml</artifactId>
<version>6.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>language</artifactId>
<version>6.10.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>legacy-modes</artifactId>
<version>6.3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lint</artifactId>
<version>6.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>search</artifactId>
<version>6.5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>state</artifactId>
<version>6.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>view</artifactId>
<version>6.23.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>common</artifactId>
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>highlight</artifactId>
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>javascript</artifactId>
<version>1.4.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>json</artifactId>
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>lr</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>xml</artifactId>
<version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lit-labs</groupId>
<artifactId>ssr-dom-shim</artifactId>
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lit</groupId>
<artifactId>reactive-element</artifactId>
<version>2.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>vaadin-webcomponents</artifactId>
<version>24.3.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.open-wc</groupId>
<artifactId>dedupe-mixin</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.polymer</groupId>
<artifactId>polymer</artifactId>
<version>3.5.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.types</groupId>
<artifactId>trusted-types</artifactId>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>router</artifactId>
<version>1.7.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-development-mode-detector</artifactId>
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-usage-statistics</artifactId>
<version>2.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.webcomponents</groupId>
<artifactId>shadycss</artifactId>
<version>1.11.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>codemirror</artifactId>
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>crelt</artifactId>
<version>1.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit-element</artifactId>
<version>4.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit-html</artifactId>
<version>3.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit</artifactId>
<version>3.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>path-to-regexp</artifactId>
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>style-mod</artifactId>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>w3c-keyname</artifactId>
<version>2.2.8</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
40 changes: 7 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,45 +166,45 @@
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>vaadin-webcomponents</artifactId>
<version>24.3.6</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<!-- Router -->
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>router</artifactId>
<version>1.7.5</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<!-- Codemirror -->
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>codemirror</artifactId>
<version>6.0.1</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-javascript</artifactId>
<version>6.2.1</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-xml</artifactId>
<version>6.0.2</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-json</artifactId>
<version>6.0.1</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>legacy-modes</artifactId>
<version>6.3.3</version>
<!--<scope>provided</scope>-->
<scope>provided</scope>
</dependency>
<!-- Testing -->
<dependency>
Expand Down Expand Up @@ -232,32 +232,6 @@
</dependencies>
<build>
<plugins>
<!-- Workaround for web-bundler (removing mvnpm deps from target quarkus-app) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>delete-mvnpm-deps</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Delete libraries starting with org.mvnpm -->
<delete includeemptydirs="true">
<fileset dir="${project.build.directory}/quarkus-app/lib/main">
<include name="org.mvnpm*" />
</fileset>
</delete>
</target>
<failOnError>false</failOnError>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/io/mvnpm/MavenRepositoryApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.mvnpm.esbuild.install.MvnpmInfo;
import io.mvnpm.esbuild.install.WebDepsInstaller;
import io.mvnpm.esbuild.model.WebDependency;
import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.config.HttpClientConfig;
Expand Down Expand Up @@ -68,6 +69,7 @@ public void testFileTooLong() throws IOException {
}

@Test
@DisabledOnIntegrationTest
public void testComposite() throws IOException {
RestAssuredConfig config = RestAssured.config()
.httpClient(HttpClientConfig.httpClientConfig()
Expand Down

0 comments on commit f94b341

Please sign in to comment.