Issue #1298

jetty-gcloud/jetty-gcloud-session-manager/pom.xml

@@ -118,12 +118,48 @@
                                replace="maven://\1/\2/\3|lib/gcloud/\2-\3.jar"
                                byline="true"
 		/>
+                <replaceregexp file="${project.build.directory}/deps.txt"
+                               match="The following files have been resolved:"
+                               replace=""
+                />
               </tasks>
             </configuration>
 	  </execution>
+           <execution>
+            <id>process-mod</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <concat destfile="${project.build.directory}/gcloud-datastore.mod">
+                  <fileset file="src/main/config-template/modules/gcloud-datastore.mod"/>
+                  <fileset file="${project.build.directory}/deps.txt"/>
+                </concat>
+              </tasks>
+            </configuration>
+          </execution>
+
          </executions>
       </plugin>
-
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/config.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
    </plugins>
   </build>
 

jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>config</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/config-template</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <excludes>
+        <exclude>**/gcloud-datastore.mod</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>modules</outputDirectory>
+      <includes>
+        <include>gcloud-datastore.mod</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod

@@ -0,0 +1,13 @@
+[description]
+Enables GCloud Datastore API and implementation
+
+[tags]
+3rdparty
+gcloud
+
+[depends]
+gcloud
+jcl-slf4j
+jul-impl
+
+[files]

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod

@@ -1,58 +0,0 @@
-[description]
-Enables GCloud Datastore API and implementation
-
-[tags]
-3rdparty
-gcloud
-
-[depends]
-gcloud
-jcl-slf4j
-jul-impl
-
-[files]
-maven://aopalliance/aopalliance/1.0|lib/gcloud/aopalliance-1.0.jar
-maven://com.fasterxml.jackson.core/jackson-core/2.1.3|lib/gcloud/jackson-core-2.1.3.jar
-maven://com.google.api/api-common/0.0.2|lib/gcloud/api-common-0.0.2.jar
-maven://com.google.api-client/google-api-client/1.20.0|lib/gcloud/google-api-client-1.20.0.jar
-maven://com.google.api-client/google-api-client-appengine/1.21.0|lib/gcloud/google-api-client-appengine-1.21.0.jar
-maven://com.google.api-client/google-api-client-servlet/1.21.0|lib/gcloud/google-api-client-servlet-1.21.0.jar
-maven://com.google.api/gax/0.0.25|lib/gcloud/gax-0.0.25.jar
-maven://com.google.api.grpc/grpc-google-common-protos/0.1.3|lib/gcloud/grpc-google-common-protos-0.1.3.jar
-maven://com.google.api.grpc/grpc-google-iam-v1/0.1.3|lib/gcloud/grpc-google-iam-v1-0.1.3.jar
-maven://com.google.auth/google-auth-library-credentials/0.6.0|lib/gcloud/google-auth-library-credentials-0.6.0.jar
-maven://com.google.auth/google-auth-library-oauth2-http/0.6.0|lib/gcloud/google-auth-library-oauth2-http-0.6.0.jar
-maven://com.google.auto.value/auto-value/1.2|lib/gcloud/auto-value-1.2.jar
-maven://com.google.cloud.datastore/datastore-v1-proto-client/1.3.0|lib/gcloud/datastore-v1-proto-client-1.3.0.jar
-maven://com.google.cloud.datastore/datastore-v1-protos/1.3.0|lib/gcloud/datastore-v1-protos-1.3.0.jar
-maven://com.google.cloud/google-cloud-core/0.7.0|lib/gcloud/google-cloud-core-0.7.0.jar
-maven://com.google.cloud/google-cloud-datastore/0.7.0|lib/gcloud/google-cloud-datastore-0.7.0.jar
-maven://com.google.code.findbugs/jsr305/1.3.9|lib/gcloud/jsr305-1.3.9.jar
-maven://com.google.code.gson/gson/2.3|lib/gcloud/gson-2.3.jar
-maven://com.google.guava/guava/19.0|lib/gcloud/guava-19.0.jar
-maven://com.google.http-client/google-http-client/1.21.0|lib/gcloud/google-http-client-1.21.0.jar
-maven://com.google.http-client/google-http-client-appengine/1.21.0|lib/gcloud/google-http-client-appengine-1.21.0.jar
-maven://com.google.http-client/google-http-client-jackson/1.21.0|lib/gcloud/google-http-client-jackson-1.21.0.jar
-maven://com.google.http-client/google-http-client-jackson2/1.19.0|lib/gcloud/google-http-client-jackson2-1.19.0.jar
-maven://com.google.http-client/google-http-client-jdo/1.21.0|lib/gcloud/google-http-client-jdo-1.21.0.jar
-maven://com.google.http-client/google-http-client-protobuf/1.20.0|lib/gcloud/google-http-client-protobuf-1.20.0.jar
-maven://com.google.inject/guice/4.0|lib/gcloud/guice-4.0.jar
-maven://com.google.oauth-client/google-oauth-client/1.21.0|lib/gcloud/google-oauth-client-1.21.0.jar
-maven://com.google.oauth-client/google-oauth-client-appengine/1.21.0|lib/gcloud/google-oauth-client-appengine-1.21.0.jar
-maven://com.google.oauth-client/google-oauth-client-servlet/1.21.0|lib/gcloud/google-oauth-client-servlet-1.21.0.jar
-maven://com.google.protobuf/protobuf-java/3.0.0|lib/gcloud/protobuf-java-3.0.0.jar
-maven://com.google.protobuf/protobuf-java-util/3.0.0|lib/gcloud/protobuf-java-util-3.0.0.jar
-maven://commons-codec/commons-codec/1.3|lib/gcloud/commons-codec-1.3.jar
-maven://commons-logging/commons-logging/1.1.1|lib/gcloud/commons-logging-1.1.1.jar
-maven://io.grpc/grpc-context/1.0.1|lib/gcloud/grpc-context-1.0.1.jar
-maven://io.grpc/grpc-core/1.0.1|lib/gcloud/grpc-core-1.0.1.jar
-maven://io.grpc/grpc-protobuf/1.0.1|lib/gcloud/grpc-protobuf-1.0.1.jar
-maven://io.grpc/grpc-protobuf-lite/1.0.1|lib/gcloud/grpc-protobuf-lite-1.0.1.jar
-maven://javax.inject/javax.inject/1|lib/gcloud/javax.inject-1.jar
-maven://javax.jdo/jdo2-api/2.3-eb|lib/gcloud/jdo2-api-2.3-eb.jar
-maven://javax.transaction/transaction-api/1.1|lib/gcloud/transaction-api-1.1.jar
-maven://joda-time/joda-time/2.9.2|lib/gcloud/joda-time-2.9.2.jar
-maven://org.apache.httpcomponents/httpclient/4.0.1|lib/gcloud/httpclient-4.0.1.jar
-maven://org.apache.httpcomponents/httpcore/4.0.1|lib/gcloud/httpcore-4.0.1.jar
-maven://org.codehaus.jackson/jackson-core-asl/1.9.11|lib/gcloud/jackson-core-asl-1.9.11.jar
-maven://org.json/json/20151123|lib/gcloud/json-20151123.jar