👷 Prepare for 1.1.1 release

### added * [Add .proto output files to kivakit-microservice GRPC service](#89) * Upgraded to (modular) Wicket 9.6 * Build documentation ### fixed * [Division microservice example is broken #87](#87) * [Broken listener chain due to inheritance from mixin and base component #86](#86) * [Documentation links are broken in kivakit 1.1.0 #88](#88)
Telenav · Nov 6, 2021 · 523419f · 523419f
1 parent 616dfc6
commit 523419f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/kivakit-resource/src/main/java/com/telenav/kivakit/filesystem/File.java b/kivakit-resource/src/main/java/com/telenav/kivakit/filesystem/File.java
@@ -70,7 +70,7 @@
  *
  * <ul>
  *     <li>{@link #parse(Listener listener, String)}</li>
- *     <li>{@link #file(URI)}</li>
+ *     <li>{@link #file(Listener, URI)}</li>
  *     <li>{@link #file(FilePath)}</li>
  *     <li>{@link #file(java.io.File)}</li>
  * </ul>

diff --git a/kivakit-resource/src/main/java/com/telenav/kivakit/resource/resources/packaged/Package.java b/kivakit-resource/src/main/java/com/telenav/kivakit/resource/resources/packaged/Package.java
@@ -109,8 +109,8 @@ public static Package packageFrom(Listener listener, Class<?> _packageType, Stri
      * the form of {@link Package}s).
      *
      * @author jonathanl (shibo)
-     * @see Resource#resolve(String)
-     * @see Resource#resolve(ResourceIdentifier)
+     * @see Resource#resolve(Listener, String)
+     * @see Resource#resolve(Listener, ResourceIdentifier)
      */
     @UmlClassDiagram(diagram = DiagramResourceService.class)
     @LexakaiJavadoc(complete = true)

diff --git a/superpom/pom.xml b/superpom/pom.xml
@@ -126,6 +126,7 @@
         <jakarta.activation.version>2.0.0</jakarta.activation.version>
         <java.mail.version>1.6.2</java.mail.version>
         <java.activation.version>1.2.0</java.activation.version>
+        <javax.servlet.api.version>3.1.0</javax.servlet.api.version>
 
         <!-- KivaKit Version -->
 
@@ -190,6 +191,7 @@
         <swagger.webjar.version>3.51.2</swagger.webjar.version>
         <httpclient.version>4.5.13</httpclient.version>
         <jakarta.ws.rs.version>2.1.6</jakarta.ws.rs.version>
+        <jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
 
         <!-- XML -->
 
@@ -471,9 +473,6 @@
                             <testQuick>${testQuick}</testQuick>
                         </systemPropertyVariables>
                         <argLine>
-                            --add-opens org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED
-                            --add-opens org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED
-                            --illegal-access=permit
                             -Xmx2g
                         </argLine>
                     </configuration>
@@ -733,6 +732,11 @@
                 <artifactId>javax.activation</artifactId>
                 <version>${java.activation.version}</version>
             </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet.api.version}</version>
+            </dependency>
 
             <!-- Jersey -->
 
@@ -1040,6 +1044,10 @@
                         <groupId>javax.activation</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>com.sun.activation</groupId>
                         <artifactId>*</artifactId>
@@ -1127,6 +1135,11 @@
                 </exclusions>
 
             </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet.api.version}</version>
+            </dependency>
 
             <!-- Mail -->
 
@@ -1348,11 +1361,6 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -1383,6 +1391,17 @@
                 <artifactId>log4j</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <!-- Web -->
 
@@ -1468,6 +1487,7 @@
             </dependency>
 
         </dependencies>
+
     </dependencyManagement>
 
 </project>