aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <r.zwitserloot@projectlombok.org>2020-02-27 21:31:26 +0100
committerReinier Zwitserloot <r.zwitserloot@projectlombok.org>2020-02-27 21:31:26 +0100
commitf232e9f8b89395d6a1c596faa4f8abec4fa8f2f9 (patch)
tree4cfc39a4d6a14e1120b4fe63330e012d65277b61
parent7993aa20cd20cdc030f90ee9f33c1b74c023d7ca (diff)
downloadlombok-f232e9f8b89395d6a1c596faa4f8abec4fa8f2f9.tar.gz
lombok-f232e9f8b89395d6a1c596faa4f8abec4fa8f2f9.tar.bz2
lombok-f232e9f8b89395d6a1c596faa4f8abec4fa8f2f9.zip
[website] ecj instructions were outdated and the pom link was broken
-rw-r--r--src/website/lombok/website/WebsiteMaker.java2
-rw-r--r--website/templates/setup/ecj-in-maven-pom-example.xml81
-rw-r--r--website/templates/setup/ecj.html3
3 files changed, 84 insertions, 2 deletions
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