Skip to content

Commit

Permalink
Enable Spotless (jenkinsci#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
@basil
basil authored Dec 11, 2023
1 parent ee66c56 commit 1ba563c
Show file tree
Hide file tree
Showing 7 changed files with 187 additions and 163 deletions.
3 changes: 1 addition & 2 deletions annotation/src/main/java/com/infradna/tool/bridge_method_injector/BridgeMethodsAdded.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@
*/
@Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE)
public @interface BridgeMethodsAdded {
}
public @interface BridgeMethodsAdded {}
3 changes: 1 addition & 2 deletions annotation/src/main/java/com/infradna/tool/bridge_method_injector/WithBridgeMethods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
*/
package com.infradna.tool.bridge_method_injector;

import org.jvnet.hudson.annotation_indexer.Indexed;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.jvnet.hudson.annotation_indexer.Indexed;

/**
* Request that bridge methods of the same name and same arguments be generated
Expand Down
109 changes: 54 additions & 55 deletions injector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,67 @@
<artifactId>bridge-method-injector-parent</artifactId>
<version>${revision}${changelist}</version>
</parent>

<artifactId>bridge-method-injector</artifactId>
<packaging>maven-plugin</packaging>

<name>bridge-method-injector</name>
<description>Evolve your classes without breaking compatibility</description>

<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>

<properties>
<asm.version>9.6</asm.version>
<maven-plugin-tools.version>3.10.2</maven-plugin-tools.version>
<maven.version>3.8.1</maven.version>
</properties>

<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bridge-method-annotation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven-plugin-tools.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
Expand All @@ -46,8 +92,8 @@
<mkdir dir="target/test-classes/synthetics" />

<!-- basic sanity. unmodified client and v1 should work as expected -->
<javac release="${maven.compiler.release}" srcdir="src/test/v1" destdir="target/test-classes/v1" includeantruntime="false" />
<javac release="${maven.compiler.release}" srcdir="src/test/client" destdir="target/test-classes/client" classpath="target/test-classes/v1" includeantruntime="false" />
<javac destdir="target/test-classes/v1" includeantruntime="false" release="${maven.compiler.release}" srcdir="src/test/v1" />
<javac classpath="target/test-classes/v1" destdir="target/test-classes/client" includeantruntime="false" release="${maven.compiler.release}" srcdir="src/test/client" />
<java classname="Main" failonerror="true">
<arg value="foo" />
<classpath>
Expand All @@ -57,7 +103,7 @@
</java>

<!-- compile v2 -->
<javac release="${maven.compiler.release}" srcdir="src/test/v2" destdir="target/test-classes/v2" classpath="${maven.compile.classpath}" includeantruntime="false">
<javac classpath="${maven.compile.classpath}" destdir="target/test-classes/v2" includeantruntime="false" release="${maven.compiler.release}" srcdir="src/test/v2">
<compilerarg value="-XprintProcessorInfo" />
<classpath>
<pathelement path="target/classes" />
Expand All @@ -81,7 +127,7 @@
</java>

<!-- compile synthetics -->
<javac release="${maven.compiler.release}" srcdir="src/test/synthetics" destdir="target/test-classes/synthetics" classpath="${maven.compile.classpath}" includeantruntime="false">
<javac classpath="${maven.compile.classpath}" destdir="target/test-classes/synthetics" includeantruntime="false" release="${maven.compiler.release}" srcdir="src/test/synthetics">
<compilerarg value="-XprintProcessorInfo" />
<classpath>
<pathelement path="target/classes" />
Expand Down Expand Up @@ -118,51 +164,4 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bridge-method-annotation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven-plugin-tools.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit 1ba563c

Please sign in to comment.