Skip to content

Commit

Permalink
Ban org.ow2.asm:asm in non-deployment modules #493
Browse files Browse the repository at this point in the history
  • Loading branch information
ppalaga committed Aug 23, 2022
1 parent bf5b863 commit 588d5dd
Show file tree
Hide file tree
Showing 98 changed files with 96 additions and 12 deletions.
8 changes: 8 additions & 0 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -206,6 +210,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion core/pom.xml → extensions/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
72 changes: 72 additions & 0 deletions extensions/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-cxf-extensions</artifactId>
<name>Quarkus CXF - Extensions</name>
<packaging>pom</packaging>

<modules>
<module>woodstox</module>
<module>core</module>
<module>features-logging</module>
<module>features-metrics</module>
<module>ws-security</module>
<module>transports-http-hc5</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<executions>
<execution>
<id>set-enforce-non-deployment-property</id>
<inherited>false</inherited>
<goals>
<goal>execute</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<source>
if (project.artifactId.endsWith('-deployment')) {
properties['enforce-non-deployment.skip'] = true;
}
</source>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-non-deployment</id>
<configuration>
<skip>${enforce-non-deployment.skip}</skip>
<rules>
<bannedDependencies>
<excludes>
<!-- <exclude>org.ow2.asm:asm</exclude> -->
</excludes>
</bannedDependencies>
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion woodstox/pom.xml → extensions/woodstox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion ws-security/pom.xml → extensions/ws-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-parent</artifactId>
<artifactId>quarkus-cxf-extensions</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
File renamed without changes.
16 changes: 10 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<supported-maven.versions>[3.6.2,)</supported-maven.versions>

<cq-maven-plugin.version>3.1.1</cq-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
Expand All @@ -65,6 +66,9 @@
<!-- maven-compiler-plugin -->
<maven.compiler.release>11</maven.compiler.release>

<!-- maven-enforcer-plugin -->
<enforce-non-deployment.skip>false</enforce-non-deployment.skip>

</properties>

<scm>
Expand All @@ -76,12 +80,7 @@

<modules>
<module>bom</module>
<module>woodstox</module>
<module>core</module>
<module>features-logging</module>
<module>features-metrics</module>
<module>ws-security</module>
<module>transports-http-hc5</module>
<module>extensions</module>
<module>docs</module>
<module>bom-test</module>
<module>test-util</module>
Expand Down Expand Up @@ -139,6 +138,11 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>${groovy-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-maven-plugin</artifactId>
Expand Down

0 comments on commit 588d5dd

Please sign in to comment.