Merge remote-tracking branch 'upstream/master' into superToBuilder

6 files changed, 46 insertions, 90 deletions

diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index f81a3dd9..995f298a 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -7,6 +7,10 @@
 	margin-bottom: 40px;
 }
 
+pre {
+	text-align: left;
+}
+
 .buttonLike {
 	cursor: pointer;
 	background: -webkit-linear-gradient(top, #FFFEF7, #CFCEC7);
diff --git a/website/resources/files/pom.xml b/website/resources/files/pom.xml
deleted file mode 100644
index 6562afe8..00000000
--- a/website/resources/files/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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>
-		<lombok.version>1.16.8</lombok.version>
-	</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.5.1</version>
-					<configuration>
-						<compilerId>eclipse</compilerId>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.7</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>2.10</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>
diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js
index 58db28cc..62beca81 100644
--- a/website/resources/js/supporters.js
+++ b/website/resources/js/supporters.js
@@ -77,7 +77,7 @@
 				ji.attr("title", n.text());
 				a.prepend(ji);
 			};
-			i.src = 'files/' + this.logo;
+			i.src = '/files/' + this.logo;
 		}
 		return d;
 	}
@@ -132,6 +132,7 @@
 	var supPerBar = 4;
 	function updateSupporterBar() {
 		var s = $(".supporterBar");
+		if (s.length === 0) return;
 		s.find(".introText").show();
 		s.append($("<div />").addClass("sbCnt"));
 		var sf = s.find(".supporterFooter").show();
diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html
index 3fa28f83..0e04596c 100644
--- a/website/templates/_download-edge.html
+++ b/website/templates/_download-edge.html
@@ -10,7 +10,39 @@
 		</div><div class="row text-center">
 			<h2><a href="/lombok-edge.jar" id="downloadLink">Download edge release now!</a></h2>
 			<p>
-				You can use the edge release also from your build tool using <a href="https://jitpack.io/#org.projectlombok/lombok/master-SNAPSHOT">the JitPack repository</a>.
+				You can use the edge release from maven using the projectlombok.org repository:<pre>
+&lt;repositories&gt;
+	&lt;repository&gt;
+		&lt;id&gt;projectlombok.org&lt;/id&gt;
+		&lt;url&gt;https://projectlombok.org/edge-releases&lt;/url&gt;
+	&lt;/repository&gt;
+&lt;/repositories&gt;</pre>
+<pre>
+&lt;dependencies&gt;
+	&lt;dependency&gt;
+		&lt;groupId&gt;org.projectlombok&lt;/groupId&gt;
+		&lt;artifactId&gt;lombok&lt;/artifactId&gt;
+		&lt;version&gt;edge-SNAPSHOT&lt;/version&gt;
+		&lt;scope&gt;provided&lt;/scope&gt;
+	&lt;/dependency&gt;
+&lt;/dependencies&gt;</pre>
+			</p>
+			<p>
+				You can use the edge release from gradle using the projectlombok.org repository:<pre>
+repositories {
+	mavenCentral()
+	maven { url 'https://projectlombok.org/edge-releases' }
+}
+
+plugins {
+	id 'net.ltgt.apt' version '0.10'
+}
+
+dependencies {
+	compileOnly 'org.projectlombok:lombok:edge-SNAPSHOT'
+	
+	apt 'org.projectlombok:lombok:edge-SNAPSHOT'
+}</pre>
 			</p>
 		</div><div class="row text-center">
 			<p>
diff --git a/website/templates/features/delombok.html b/website/templates/features/delombok.html
index 6f41fc46..56b02f7d 100644
--- a/website/templates/features/delombok.html
+++ b/website/templates/features/delombok.html
@@ -17,22 +17,19 @@
 
 		<p>
 			Delombok is included in <code>lombok.jar</code>. To use it, all you need to run on the command line is:
-			<div class="snippet">
-				<pre>java -jar lombok.jar delombok src -d src-delomboked</pre>
-			</div><br />
+			<pre>java -jar lombok.jar delombok src -d src-delomboked</pre>
+			<br />
 			Which will duplicate the contents of the <code>src</code> directory into the <code>src-delomboked</code> directory, which will be created if it doesn't already exist, but delomboked of course. Delombok on the command line has a few more options; use the <code>--help</code> parameter to see more options.
 		</p><p>
 			To let delombok print the transformation result of a single java file directly to standard output, you can use:
-			<div class="snippet">
-				<pre>java -jar lombok.jar delombok -p MyJavaFile.java</pre>
-			</div>
+			<pre>java -jar lombok.jar delombok -p MyJavaFile.java</pre>
 		</p>
 
 		<@f.main.h3 title="Running delombok in ant" />
 
 		<p>
 			<code>lombok.jar</code> includes an ant task which can apply delombok for you. For example, to create javadoc for your project, your <code>build.xml</code> file would look something like:
-			<div class="snippet"><pre>&lt;target name="javadoc"&gt;
+			<pre>&lt;target name="javadoc"&gt;
 &lt;taskdef classname="lombok.delombok.ant.Tasks$Delombok" classpath="lib/lombok.jar" name="delombok" /&gt;
 &lt;mkdir dir="build/src-delomboked" /&gt;
 <strong>&lt;delombok verbose="true" encoding="UTF-8" to="build/src-delomboked" from="src"&gt;</strong>
@@ -41,7 +38,7 @@
 &lt;mkdir dir="build/api" /&gt;
 &lt;javadoc sourcepath="build/src-delomboked" defaultexcludes="yes" destdir="build/api" /&gt;
 &lt;/target&gt;</pre>
-			</div><br />
+			<br />
 			Instead of a <code>from</code> attribute, you can also nest <code>&lt;fileset&gt;</code> nodes.
 		</p>
 
diff --git a/website/templates/setup/gradle.html b/website/templates/setup/gradle.html
index 41d90dcc..b3c7de3a 100644
--- a/website/templates/setup/gradle.html
+++ b/website/templates/setup/gradle.html
@@ -29,13 +29,13 @@ repositories {
 }
 
 plugins {
-    id 'net.ltgt.apt' version '0.10'
+	id 'net.ltgt.apt' version '0.10'
 }
 
 dependencies {
 	compileOnly 'org.projectlombok:lombok:${version}'
 	
-	apt "org.projectlombok:lombok:${version}"
+	apt 'org.projectlombok:lombok:${version}'
 }</pre>
 		</p><p>
 			Remember that you still have to download <code>lombok.jar</code> (or find it in gradle's caches) and run it as a jarfile, if you wish to program in eclipse. The plugin makes that part easier.