--- a/server/build.gradle Tue Jul 08 18:44:01 2014 +0200
+++ b/server/build.gradle Wed Jul 09 12:14:53 2014 +0200
@@ -3,8 +3,8 @@
group = 'org.iri_research.renkan'
version = '0.7.11'
-
-
+
+
gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint"
@@ -37,11 +37,11 @@
sourceCompatibility = 1.7
targetCompatibility = 1.7
-
+
repositories {
mavenLocal()
mavenCentral()
-
+
maven { url "http://repo.maven.apache.org/maven2" }
maven { url "http://maven.springframework.org/release" }
maven { url "http://maven.springframework.org/milestone" }
@@ -54,10 +54,10 @@
events "passed", "skipped", "failed"//, "standardOut", "standardError"
}
}
-
+
dependencies {
testCompile group: 'junit', name: 'junit', version:junit_version
runtime group: 'org.slf4j', name: 'slf4j-log4j12', version:slf4j_log4j12_version
}
-
+
}
--- a/server/renkan-core/pom.xml Tue Jul 08 18:44:01 2014 +0200
+++ b/server/renkan-core/pom.xml Wed Jul 09 12:14:53 2014 +0200
@@ -150,7 +150,7 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -192,7 +192,7 @@
<artifactId>mongo-java-driver</artifactId>
<version>${mongo-driver-version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-log4j12-version}</version>
--- a/server/renkan-management/build.gradle Tue Jul 08 18:44:01 2014 +0200
+++ b/server/renkan-management/build.gradle Wed Jul 09 12:14:53 2014 +0200
@@ -15,7 +15,7 @@
buildscript {
repositories { jcenter() }
dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.1'
+ classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.2'
}
}
@@ -37,3 +37,6 @@
}
+configure(shadowJar) {
+ group = BasePlugin.BUILD_GROUP
+}
--- a/server/renkan-management/pom.xml Tue Jul 08 18:44:01 2014 +0200
+++ b/server/renkan-management/pom.xml Wed Jul 09 12:14:53 2014 +0200
@@ -103,10 +103,10 @@
</plugin-->
<plugin>
<!-- create an all-in-one executable jar with maven-shade-plugin
- bound to phase:package
+ bound to phase:package
special handling for spring.handlers/spring.schemas files
to prevent overwriting (maven-shade-plugin joins them to
- one file)
+ one file)
usage:
cd to <project>/target
--- a/server/renkan-web/pom.xml Tue Jul 08 18:44:01 2014 +0200
+++ b/server/renkan-web/pom.xml Wed Jul 09 12:14:53 2014 +0200
@@ -9,7 +9,7 @@
</parent>
<artifactId>renkan-web</artifactId>
<packaging>war</packaging>
-
+
<properties>
<surefire-version>2.16</surefire-version>
<coweb-version>1.0.1-SNAPSHOT</coweb-version>
@@ -75,7 +75,7 @@
</webApp>
</configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
@@ -457,7 +457,7 @@
<artifactId>mongo-java-driver</artifactId>
<version>${mongo-driver-version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-log4j12-version}</version>
@@ -497,7 +497,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>${spring-data-jpa-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
@@ -505,7 +505,7 @@
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <artifactId>persistence-api</artifactId>
<version>${javax-persistence-api-version}</version>
</dependency>
<dependency>
@@ -569,7 +569,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -584,12 +584,12 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
@@ -604,7 +604,7 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${spring-security-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>de.undercouch</groupId>
<artifactId>bson4jackson</artifactId>