Merge branch 'deploy' into maven

Cardshifter · Jan 30, 2015 · b60a9ed · b60a9ed
2 parents b957aac + d629b22
commit b60a9ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/cardshifter-api/pom.xml b/cardshifter-api/pom.xml
@@ -29,6 +29,23 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+					<updateReleaseInfo>true</updateReleaseInfo>
+				</configuration>
+				<executions>
+					<execution>
+						<id>deploy</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>deploy</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/cardshifter-modapi/pom.xml b/cardshifter-modapi/pom.xml
@@ -53,7 +53,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
+<!--			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.10.1</version>
 				<executions>
@@ -65,12 +65,13 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin>-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
 					<skip>false</skip>
+					<updateReleaseInfo>true</updateReleaseInfo>
 				</configuration>
 				<executions>
 					<execution>