diff --git a/android/guava-bom/pom.xml b/android/guava-bom/pom.xml
index 8fde93d1a75a4..e6a5d9f132acd 100644
--- a/android/guava-bom/pom.xml
+++ b/android/guava-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.guava
guava-bom
- HEAD-android-SNAPSHOT
+ 1.0-HEAD-android-SNAPSHOT
pom
diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml
index 33dc15799d00b..8dc3771c6e0c5 100644
--- a/android/guava-testlib/pom.xml
+++ b/android/guava-testlib/pom.xml
@@ -5,7 +5,7 @@
com.google.guava
guava-parent
- HEAD-android-SNAPSHOT
+ 1.0-HEAD-android-SNAPSHOT
guava-testlib
Guava Testing Library
diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index bf9bec45c651d..f9b485f5e2cfe 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -5,7 +5,7 @@
com.google.guava
guava-parent
- HEAD-android-SNAPSHOT
+ 1.0-HEAD-android-SNAPSHOT
guava-tests
Guava Unit Tests
diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index 501b3967264c0..ca267e58ef527 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -6,7 +6,7 @@
com.google.guava
guava-parent
- HEAD-android-SNAPSHOT
+ 1.0-HEAD-android-SNAPSHOT
guava
bundle
diff --git a/android/pom.xml b/android/pom.xml
index 96ea9fa41df5c..c8e3e357322f9 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -6,7 +6,7 @@
4.0.0
com.google.guava
guava-parent
- HEAD-android-SNAPSHOT
+ 1.0-HEAD-android-SNAPSHOT
pom
Guava Maven Parent
Parent for guava artifacts
diff --git a/guava-bom/pom.xml b/guava-bom/pom.xml
index 8c5ea2ec035f3..af7c956adbaaf 100644
--- a/guava-bom/pom.xml
+++ b/guava-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.guava
guava-bom
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
pom
diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
index 86fa4b971aa90..a6f9ee291655a 100644
--- a/guava-gwt/pom.xml
+++ b/guava-gwt/pom.xml
@@ -5,7 +5,7 @@
com.google.guava
guava-parent
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
guava-gwt
Guava GWT compatible libs
diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
index f60890e78e7aa..cd2bc969833b1 100644
--- a/guava-testlib/pom.xml
+++ b/guava-testlib/pom.xml
@@ -5,7 +5,7 @@
com.google.guava
guava-parent
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
guava-testlib
Guava Testing Library
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index 8596221d83161..ca74eb2e2814b 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -5,7 +5,7 @@
com.google.guava
guava-parent
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
guava-tests
Guava Unit Tests
diff --git a/guava/pom.xml b/guava/pom.xml
index f0e50c58bb00a..413f15f767ce0 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -6,7 +6,7 @@
com.google.guava
guava-parent
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
guava
jar
@@ -62,9 +62,11 @@
- com.google.common
+ true
+
+ /module-info.class
@@ -100,6 +102,44 @@
maven-compiler-plugin
+
+
+ default-compile
+
+
+ 1.8
+
+ module-info.java
+
+
+
+
+ compile-java-9
+ compile
+
+ compile
+
+
+ 9
+
+ ${project.basedir}/src
+
+
+
+
+ -sourcepath
+ ${project.basedir}/src
+ --add-reads=com.google.common=ALL-UNNAMED
+
+ -XDcompilePolicy=simple
+
+ true
+
+
+
maven-source-plugin
diff --git a/guava/src/module-info.java b/guava/src/module-info.java
new file mode 100644
index 0000000000000..e459eb9d9e8ea
--- /dev/null
+++ b/guava/src/module-info.java
@@ -0,0 +1,44 @@
+// GENERATED FILE - DO NOT EDIT
+
+/*
+ * Copyright (C) 2008 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Google Guava
+ */
+module com.google.common {
+ requires java.base;
+ requires java.logging;
+ requires jdk.unsupported;
+
+ exports com.google.common.annotations;
+ exports com.google.common.base;
+ exports com.google.common.cache;
+ exports com.google.common.collect;
+ exports com.google.common.escape;
+ exports com.google.common.eventbus;
+ exports com.google.common.graph;
+ exports com.google.common.hash;
+ exports com.google.common.html;
+ exports com.google.common.io;
+ exports com.google.common.math;
+ exports com.google.common.net;
+ exports com.google.common.primitives;
+ exports com.google.common.reflect;
+ exports com.google.common.util.concurrent;
+ exports com.google.common.xml;
+ exports com.google.thirdparty.publicsuffix;
+}
diff --git a/pom.xml b/pom.xml
index e22e870110645..10654cd216c3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
com.google.guava
guava-parent
- HEAD-jre-SNAPSHOT
+ 1.0-HEAD-jre-SNAPSHOT
pom
Guava Maven Parent
Parent for guava artifacts
@@ -125,21 +125,13 @@
maven-compiler-plugin
- 3.8.1
+ 3.12.1
1.8
UTF-8
true
-
-
- -sourcepath
- doesnotexist
+
-XDcompilePolicy=simple