You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/12 19:08:55 UTC
[1/3] git commit: release build fixes
release build fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8f4179f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8f4179f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8f4179f1
Branch: refs/heads/master
Commit: 8f4179f1a6bede2e0a86a45ddf5b106c1226e2c9
Parents: 7d4c14b
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Mar 12 18:51:37 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Mar 12 18:51:37 2013 +0100
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 25 --------
build/archetypes/marmotta-archetype-webapp/pom.xml | 25 --------
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
libraries/kiwi/pom.xml | 47 ---------------
parent/pom.xml | 22 ++++++-
pom.xml | 29 ++++++---
7 files changed, 42 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index a989f06..28c37c6 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -66,29 +66,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index c7fc853..1053ad0 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -66,29 +66,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 12b9b90..c45de08 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -279,7 +279,7 @@
</build>
</profile>
<profile>
- <id>apache-release</id>
+ <id>marmotta-release</id>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 957a264..5110295 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -166,7 +166,7 @@
</build>
</profile>
<profile>
- <id>apache-release</id>
+ <id>marmotta-release</id>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 96d4fa2..8fe1996 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -85,53 +85,6 @@
<artifactId>surefire-booter</artifactId>
<version>2.13</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <!-- uncomment for release deployment -->
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <inherited>true</inherited>
- <configuration>
- <instructions>
- <Bundle-DocURL>http://code.google.com/p/ldpath/</Bundle-DocURL>
- <Bundle-Vendor>Salzburg Research</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>1.7.4</version>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Salzburg Research</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin> <!-- generate JRebel Configuration -->
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ee33f06..5410314 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -72,8 +72,8 @@
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</snapshotRepository>
<site>
- <id>lmf.googlecode.com</id>
- <url>http://lmf.googlecode.com</url>
+ <id>marmotta</id>
+ <url>http://marmotta.incubator.apache.org</url>
</site>
</distributionManagement>
@@ -1419,5 +1419,23 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>dist-local</id>
+
+ <distributionManagement>
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Relesases Repository</name>
+ <url>file:///tmp/repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>file:///tmp/repo</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8f4179f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dac06b9..f5aed0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,20 @@
<!-- release management -->
<build>
<plugins>
+ <!-- do not install / deploy reactor -->
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -162,7 +176,7 @@
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
- <arguments>-Pinstaller,apache-release ${arguments}</arguments>
+ <arguments>-Pinstaller,marmotta-release ${arguments}</arguments>
</configuration>
</plugin>
</plugins>
@@ -171,7 +185,7 @@
<profiles>
<!-- modified Apache Release profile (copied and modified from Apache Jackrabbit) -->
<profile>
- <id>apache-release</id>
+ <id>marmotta-release</id>
<properties>
<username>${user.name}</username>
<keyfile>${user.home}/.ssh/id_rsa</keyfile>
@@ -243,12 +257,7 @@
<descriptor>assembly.xml</descriptor>
</descriptors>
<finalName>apache-marmotta-${project.version}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>source-release-assembly</id>
- <configuration>
- <skipAssembly>true</skipAssembly>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
@@ -276,7 +285,8 @@
<include name="target/*-src.tar.gz*" />
<include name="launchers/marmotta-webapp/target/*-webapp.tar.gz*" />
- <include name="launchers/marmotta-installer/target/*-installer.zip*" />
+ <include name="launchers/marmotta-installer/target/*-installer.tar.gz*" />
+ <exclude name="*.asc.asc" />
</fileset>
</copy>
<checksum algorithm="MD5" fileext=".md5">
@@ -316,6 +326,7 @@ The vote is open for the next 72 hours and passes if a majority of at
least three +1 Marmotta PMC votes are cast.
[ ] +1 Release this package as Apache Marmotta ${project.version}
+[ ] 0 I don't feel strongly about it, but I'm okay with the release
[ ] -1 Do not release this package because...${line.separator}
</echo>
<echo />