Преглед изворни кода

jooby 2.6.0 (#5419)

- upgrade to latest release
- added missing @Dispatch annotation to mvc app
- simplify pom maintanince
Edgar Espina пре 5 година
родитељ
комит
51a1779fdc

+ 33 - 8
frameworks/Java/jooby/pom.xml

@@ -4,12 +4,6 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.jooby</groupId>
-    <artifactId>jooby-project</artifactId>
-    <version>2.5.1</version>
-  </parent>
-
   <artifactId>jooby</artifactId>
   <groupId>com.techempower</groupId>
   <version>2.0</version>
@@ -17,7 +11,7 @@
   <name>jooby 2.x</name>
 
   <properties>
-    <jooby.version>2.5.1</jooby.version>
+    <jooby.version>2.6.0</jooby.version>
     <!-- downgrade netty and make pg-client happy -->
     <netty.version>4.1.34.Final</netty.version>
     <postgresql.version>42.2.5</postgresql.version>
@@ -114,8 +108,27 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>uber-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <transformers>
+                <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>${application.class}</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
-
     </plugins>
   </build>
 
@@ -168,4 +181,16 @@
       </dependencies>
     </profile>
   </profiles>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jooby</groupId>
+        <artifactId>jooby-bom</artifactId>
+        <version>${jooby.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

+ 1 - 0
frameworks/Java/jooby/src/main/java/com/techempower/Controller.java

@@ -119,6 +119,7 @@ public class Controller {
   }
 
   @GET("/fortunes")
+  @Dispatch
   public fortunes fortunes(Context ctx) throws Exception {
     List<Fortune> fortunes = new ArrayList<>();
     try (Connection connection = dataSource.getConnection()) {

+ 33 - 7
frameworks/Kotlin/kooby/pom.xml

@@ -5,12 +5,6 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.jooby</groupId>
-    <artifactId>jooby-project</artifactId>
-    <version>2.5.1</version>
-  </parent>
-
   <artifactId>kooby</artifactId>
   <groupId>com.techempower</groupId>
   <version>2.0</version>
@@ -18,7 +12,7 @@
   <name>kooby: jooby + kotlin</name>
 
   <properties>
-    <jooby.version>2.5.1</jooby.version>
+    <jooby.version>2.6.0</jooby.version>
     <postgresql.version>42.2.5</postgresql.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -170,7 +164,39 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>uber-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <transformers>
+                <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>${application.class}</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jooby</groupId>
+        <artifactId>jooby-bom</artifactId>
+        <version>${jooby.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>