POM / site enhancements

- copy client sources - remove sources dependency from test projects - include links to examples on the site
gwtplus · Mar 13, 2018 · 9fc3198 · 9fc3198
1 parent 5bd0685
commit 9fc3198
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 113 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,7 @@
   <name>GIN (GWT INjection)</name>
   <description>GIN (GWT INjection) brings automatic dependency injection to GWT client-side code. GIN is built on top of Guice and uses (a subset of) Guice's binding language.</description>
 
+  <!-- Provide exact url for proper relative urls, even though parent has a redirect file -->
   <url>http://metteo.github.io/google-gin/site</url>
   <inceptionYear>2008</inceptionYear>
 
@@ -96,7 +97,9 @@
   </scm>
 
   <properties>
-    <!-- TODO: Upgrade to 4.x -->
+    <java.release>1.8</java.release>
+
+    <!-- TODO: Upgrade to 4.2.0 -->
     <guice.version>3.0</guice.version>
 
     <!-- mvn works with 2.8.2, ant doesn't due to manual (incomplete) classpath management -->
@@ -108,6 +111,7 @@
   </properties>
 
   <dependencies>
+    <!-- JSR-330 -->
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
@@ -121,6 +125,7 @@
       <classifier>sources</classifier>
     </dependency>
 
+    <!-- Guice and AssitedInject extension -->
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
@@ -132,6 +137,7 @@
       <version>${guice.version}</version>
     </dependency>
 
+    <!-- GWT -->
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
@@ -145,6 +151,7 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Common Annotations -->
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
@@ -158,6 +165,7 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Testing -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -178,8 +186,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${java.release}</source>
+          <target>${java.release}</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -189,6 +197,25 @@
         <configuration>
           <encoding>UTF-8</encoding>
         </configuration>
+        <executions>
+          <execution>
+            <id>client-sources</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.sourceDirectory}</directory>
+                  <include>com/google/gwt/inject/client/**/*.java</include>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -209,7 +236,6 @@
           </includes>
 
           <additionalClasspathElements>
-            <additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
             <additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
           </additionalClasspathElements>
 
@@ -229,6 +255,7 @@
               <systemPropertyVariables>
                 <!-- Add -logLevel TRACE to get more debug output -->
                 <gwt.args>
+                  -devMode
                   -gen target/generated-test-sources/test-hosted
                   -war target/war/test-hosted
                 </gwt.args>
@@ -296,7 +323,7 @@
         <version>2.8</version>
         <executions>
           <execution>
-            <id>default-cli</id>
+            <id>default-cli</id> <!-- For ant build -->
             <configuration>
               <useSubDirectoryPerScope>true</useSubDirectoryPerScope>
             </configuration>

diff --git a/src/it/higher-lower/build.xml b/src/it/higher-lower/build.xml
diff --git a/src/it/higher-lower/pom.xml b/src/it/higher-lower/pom.xml
@@ -43,12 +43,6 @@
       <artifactId>gin</artifactId>
       <version>${gin.version}</version>
     </dependency>
-    <dependency> <!-- Required until client sources are not included -->
-      <groupId>com.google.gwt.inject</groupId>
-      <artifactId>gin</artifactId>
-      <version>${gin.version}</version>
-      <classifier>sources</classifier>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/it/simple/pom.xml b/src/it/simple/pom.xml
@@ -43,12 +43,6 @@
       <artifactId>gin</artifactId>
       <version>${gin.version}</version>
     </dependency>
-    <dependency> <!-- Required until client sources are not included -->
-      <groupId>com.google.gwt.inject</groupId>
-      <artifactId>gin</artifactId>
-      <version>${gin.version}</version>
-      <classifier>sources</classifier>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -17,6 +17,12 @@
       <item name="Javadoc" href="../latest/javadoc" />
       <item name="Download" href="https://github.com/metteo/google-gin/releases" />
     </menu>
+    <menu name="Examples">
+      <item name="Simple" href="https://github.com/metteo/google-gin/tree/master/src/it/simple" />
+      <item name="Simple (demo)" href="../demos/simple" />
+      <item name="Higher Lower" href="https://github.com/metteo/google-gin/tree/master/src/it/higher-lower" />
+      <item name="Higher Lower (demo)" href="../demos/HigherLower" />
+    </menu>
     <menu ref="reports" />
   </body>
 </project>