diff options
| -rw-r--r-- | src/core/lombok/core/configuration/NullAnnotationLibrary.java | 6 | ||||
| -rw-r--r-- | src/website/lombok/website/WebsiteMaker.java | 2 | ||||
| -rw-r--r-- | website/templates/setup/ecj-in-maven-pom-example.xml | 81 | ||||
| -rw-r--r-- | website/templates/setup/ecj.html | 3 |
4 files changed, 87 insertions, 5 deletions
diff --git a/src/core/lombok/core/configuration/NullAnnotationLibrary.java b/src/core/lombok/core/configuration/NullAnnotationLibrary.java index 68760e6f..e8a07721 100644 --- a/src/core/lombok/core/configuration/NullAnnotationLibrary.java +++ b/src/core/lombok/core/configuration/NullAnnotationLibrary.java @@ -126,11 +126,11 @@ public final class NullAnnotationLibrary implements ConfigurationValueType { int start = typeUse ? 16 : 7; int split = ci.indexOf(':', start); if (split == -1) { - String nonNullAnnotation = ci.substring(start); + String nonNullAnnotation = in.substring(start); return custom(verifyTypeName(nonNullAnnotation), null, typeUse); } - String nonNullAnnotation = ci.substring(start, split); - String nullableAnnotation = ci.substring(split + 1); + String nonNullAnnotation = in.substring(start, split); + String nullableAnnotation = in.substring(split + 1); return custom(verifyTypeName(nonNullAnnotation), verifyTypeName(nullableAnnotation), typeUse); } diff --git a/src/website/lombok/website/WebsiteMaker.java b/src/website/lombok/website/WebsiteMaker.java index 88556b97..87d6dcc6 100644 --- a/src/website/lombok/website/WebsiteMaker.java +++ b/src/website/lombok/website/WebsiteMaker.java @@ -310,7 +310,7 @@ public class WebsiteMaker { for (File f : from.listFiles()) { if (f.isDirectory()) convertTemplates_(freemarker, prefix + f.getName() + "/", f, new File(to, f.getName()), depth + 1, dataModel); - if (!f.isFile() || !f.getName().endsWith(".html") || f.getName().startsWith("_")) continue; + if (!f.isFile() || f.getName().startsWith("_")) continue; to.mkdirs(); Template template = freemarker.getTemplate(prefix + f.getName()); FileOutputStream fileOut = new FileOutputStream(new File(to, f.getName())); diff --git a/website/templates/setup/ecj-in-maven-pom-example.xml b/website/templates/setup/ecj-in-maven-pom-example.xml new file mode 100644 index 00000000..3bb10722 --- /dev/null +++ b/website/templates/setup/ecj-in-maven-pom-example.xml @@ -0,0 +1,81 @@ +<#noparse> +<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.projectlombok</groupId> + <artifactId>eclipse-compiler-test</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> +</#noparse> + <lombok.version>${version}</lombok.version> +<#noparse> + </properties> + + <dependencies> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <configuration> + <compilerId>eclipse</compilerId> + <release>11</release> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-eclipse</artifactId> + <version>2.8.6</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.1.1</version> + <executions> + <execution> + <id>get-lombok</id> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <type>jar</type> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>lombok.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> +</#noparse> diff --git a/website/templates/setup/ecj.html b/website/templates/setup/ecj.html index 9d56a085..e01bc653 100644 --- a/website/templates/setup/ecj.html +++ b/website/templates/setup/ecj.html @@ -15,12 +15,13 @@ <@s.section title="Maven"> <p> - It is possible to <a href="/files/pom.xml">configure</a> <code>maven-compiler-plugin</code> with <code>maven-dependency-plugin</code> and <code>plexus-compiler-eclipse</code>. + It is possible to <a href="/setup/ecj-in-maven-pom-example.xml">configure</a> <code>maven-compiler-plugin</code> with <code>maven-dependency-plugin</code> and <code>plexus-compiler-eclipse</code>. </p><p> Before the <code>compile</code> phase, you will have to set your <code>MAVEN_OPTS</code> environment variable to include the <code>javaagent</code> argument. In the example below, <code>target</code> is your <code>${r"${project.build.directory}"}</code>. </p><p> Use the following commands in sequence to enable lombok with ecj in your Maven build: <pre> +# Make sure you've updated your pom as per <a href="/setup/ecj-in-maven-pom-example.xml">this example</a>. mvn clean <strong>dependency:copy@get-lombok</strong> set MAVEN_OPTS=<strong>-javaagent:target/lombok.jar=ECJ</strong> <em class="note">(or your OS's equivalent)</em> mvn install |