Commit 61bf6384 authored by Brian Long's avatar Brian Long
Browse files

v2.x; massive refactoring

parent 610b8263
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
# Maven
target
pom.xml.versionsBackup
/target
/pom.xml.versionsBackup
/src/gen
/it

# Eclipse
.settings
.project
.classpath
/.settings
/.project
/.classpath
+232 −152

File changed.

Preview size limit exceeded, changes collapsed.

+11 −6
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
    <includes>
        <!-- CVE-2019-17571 -->
<configuration
		xmlns="http://inteligr8.com/maven/ban"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://inteligr8.com/maven/ban https://git.inteligr8.com/inteligr8/ban-maven-plugin/raw/branch/develop/src/main/resources/ban-config.xsd">
	<rules>
		<rule>
			<id>CVE-2021-44228</id>
			<artifact>org.apache.logging.log4j::[,2.17.1)</artifact>
			<artifact>log4j:log4j</artifact>
    </includes>
		</rule>
	</rules>
</configuration>
+23 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
	<packaging>pom</packaging>

    <!-- A monthly cadence is reasonable at most organizations -->
	<version>2025.03</version>
	<version>2021.12</version>

	<name>Banned Artifact Configuration</name>
	
@@ -25,10 +25,11 @@
            </resource>
        </resources>
		<plugins>
			<!-- this purges the local Maven repository when using the `clean` goal on this project -->
			<plugin>
				<groupId>com.inteligr8</groupId>
				<artifactId>ban-maven-plugin</artifactId>
				<version>1.4.0</version>
				<version>2.0-SNAPSHOT</version>
                <executions>
                    <execution>
                        <id>purge-maven-repo</id>
@@ -42,6 +43,8 @@
                    </execution>
                </executions>
			</plugin>
			<!-- Since this is a `pom` type project, we need to execute the `resources` goal ourselves -->
			<!-- this moves the `ban-config.xml` to the build directory for install/deploy -->
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
@@ -51,6 +54,7 @@
                    </execution>
                </executions>
            </plugin>
            <!-- typical XML `install` -->
            <plugin>
                <artifactId>maven-install-plugin</artifactId>
                <configuration>
@@ -71,13 +75,27 @@
                    </execution>
                </executions>
            </plugin>
            <!-- typical XML `deploy` -->
            <plugin>
                <artifactId>maven-deploy-plugin</artifactId>
                <configuration>
                    <file>ban-config.xml</file>
                    <pomFile>pom.xml</pomFile>
                    <skip>true</skip>
                    <file>${project.build.directory}/ban-config.xml</file>
                </configuration>
                <executions>
                    <execution>
                        <id>deploy-xml</id>
                        <phase>deploy</phase>
                        <goals><goal>deploy-file</goal></goals>
                        <configuration>
                            <groupId>${project.groupId}</groupId>
                            <artifactId>${project.artifactId}</artifactId>
                            <version>${project.version}</version>
                            <packaging>xml</packaging>
                    		<pomFile>pom.xml</pomFile>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
		</plugins>
	</build>
+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@
			<plugin>
				<groupId>com.inteligr8</groupId>
				<artifactId>ban-maven-plugin</artifactId>
				<version>1.4.0</version>
				<version>2.0-SNAPSHOT</version>
				<extensions>true</extensions>
				<configuration>
					<import>
						<artifact>com.inteligr8:ban-config:[2025.03,)</artifact>
						<artifact>com.inteligr8:ban-config:[2021.12,)</artifact>
					</import>
				</configuration>
			</plugin>
Loading