Include jline-style in the uber-bundle

jline · Jan 29, 2018 · 7008567 · 7008567
1 parent 7e1f85c
commit 7008567
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/jline/pom.xml b/jline/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>sshd-core</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -114,6 +119,14 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.jline</groupId>
+                                    <artifactId>jline-style</artifactId>
+                                    <classifier>sources</classifier>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+                                </artifactItem>
 
                                 <!-- resources -->
                                 <artifactItem>
@@ -172,6 +185,14 @@
                                     <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
                                     <excludes>**/*.class</excludes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.jline</groupId>
+                                    <artifactId>jline-style</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+                                    <excludes>**/*.class</excludes>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,7 @@
         <gogo.runtime.version>1.0.8</gogo.runtime.version>
         <gogo.jline.version>1.0.8</gogo.jline.version>
         <slf4j.version>1.7.21</slf4j.version>
+        <findbugs.version>3.0.2</findbugs.version>
 
         <surefire.argLine />
     </properties>
@@ -223,6 +224,12 @@
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${findbugs.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -452,9 +459,9 @@
         <module>builtins</module>
         <module>remote-ssh</module>
         <module>remote-telnet</module>
+        <module>style</module>
         <module>jline</module>
         <module>demo</module>
-        <module>style</module>
     </modules>
 
 </project>
diff --git a/style/pom.xml b/style/pom.xml
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java b/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java
@@ -111,7 +111,7 @@ static <T extends StyleBundle> T create(final StyleResolver resolver, final Clas
         }
 
         StyleBundleInvocationHandler handler = new StyleBundleInvocationHandler(type, resolver);
-        return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, handler);
+        return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, handler);
     }
 
     /**
@@ -189,6 +189,9 @@ public String toString() {
     // @VisibleForTesting
     static class StyleBundleMethodMissingDefaultStyleException
             extends RuntimeException {
+
+        private static final long serialVersionUID = 1L;
+
         public StyleBundleMethodMissingDefaultStyleException(final Method method) {
             super(String.format("%s method missing @%s: %s",
                     StyleBundle.class.getSimpleName(),
@@ -204,6 +207,9 @@ public StyleBundleMethodMissingDefaultStyleException(final Method method) {
     // @VisibleForTesting
     static class InvalidStyleBundleMethodException
             extends RuntimeException {
+
+        private static final long serialVersionUID = 1L;
+
         public InvalidStyleBundleMethodException(final Method method, final String message) {
             super(message + ": " + method);
         }
@@ -215,7 +221,10 @@ public InvalidStyleBundleMethodException(final Method method, final String messa
     // @VisibleForTesting
     static class InvalidStyleGroupException
             extends RuntimeException {
-        public InvalidStyleGroupException(final Class type) {
+
+        private static final long serialVersionUID = 1L;
+
+        public InvalidStyleGroupException(final Class<?> type) {
             super(String.format("%s missing or invalid @%s: %s",
                     StyleBundle.class.getSimpleName(),
                     StyleGroup.class.getSimpleName(),