You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/04/08 17:46:07 UTC
[1/2] git commit: fixed dependency versions the archetypes
Repository: marmotta
Updated Branches:
refs/heads/develop 448364494 -> 994caea41
fixed dependency versions the archetypes
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/48607580
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/48607580
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/48607580
Branch: refs/heads/develop
Commit: 4860758068cd16f8fb453dd354111b2993c7e63a
Parents: 4483644
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 8 16:47:08 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 8 17:16:21 2014 +0200
----------------------------------------------------------------------
.../marmotta-archetype-module/pom.xml | 2 +-
.../marmotta-archetype-webapp/pom.xml | 22 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/48607580/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 f5301aa..94c15d1 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-core</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/48607580/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 14aff1b..3a971a2 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -137,67 +137,67 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-core</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-sparql</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldpath</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldcache-common</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-versioning-common</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-user</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-security</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-backend-kiwi</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldcache-kiwi</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-reasoner-kiwi</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-versioning-kiwi</artifactId>
- <version>${marmottaVersion}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
[2/2] git commit: Do a "clean install" instead of a "clean verify"
during the release preparation
Posted by ja...@apache.org.
Do a "clean install" instead of a "clean verify" during the release preparation
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/994caea4
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/994caea4
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/994caea4
Branch: refs/heads/develop
Commit: 994caea416ff4d932b87da47af6ccd84f89d4a0f
Parents: 4860758
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 8 17:37:01 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 8 17:37:01 2014 +0200
----------------------------------------------------------------------
pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/994caea4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2753e27..0e53d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,9 @@
<!-- the profiles to run for the release -->
<arguments>-Pinstaller,marmotta-release,sign,kiwi ${arguments}</arguments>
+ <!-- make sure all dependencies are available -->
+ <preparationGoals>clean install</preparationGoals>
+
<pushChanges>false</pushChanges>
</configuration>
</plugin>