You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/02/25 16:54:11 UTC
[1/3] git commit: MARMOTTA-431: changed package name to just
'marmotta' (replaces the other)
Repository: marmotta
Updated Branches:
refs/heads/develop f7cc0bc01 -> ef113cd2d
MARMOTTA-431: changed package name to just 'marmotta' (replaces the other)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7496b4f0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7496b4f0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7496b4f0
Branch: refs/heads/develop
Commit: 7496b4f0c4a4642e707477c90be75beddf4e8b60
Parents: 4b04fff
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Feb 25 15:11:25 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Feb 25 15:11:25 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 3 ++-
launchers/marmotta-webapp/src/deb/control/control | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7496b4f0/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index f747fde..748e486 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -145,7 +145,8 @@
<goal>jdeb</goal>
</goals>
<configuration>
- <deb>${project.build.directory}/${project.artifactId}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
+ <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
+ <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
<controlDir>${basedir}/src/deb/control</controlDir>
<dataSet>
<data>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7496b4f0/launchers/marmotta-webapp/src/deb/control/control
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/control b/launchers/marmotta-webapp/src/deb/control/control
index 103e14c..dc9a500 100644
--- a/launchers/marmotta-webapp/src/deb/control/control
+++ b/launchers/marmotta-webapp/src/deb/control/control
@@ -6,6 +6,7 @@ Architecture: all
Distribution: ldstack-nightly
Maintainer: Sergio Fernández <wi...@apache.org>
Depends: tomcat7 (>=7.0.30-1)
+Replaces: marmotta-webapp
Description: Apache Marmotta is an Open Platform for Linked Data
The goal of Apache Marmotta is to provide an open implementation of a Linked
Data Platform that can be used, extended and deployed easily by organizations
[3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by wi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ef113cd2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ef113cd2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ef113cd2
Branch: refs/heads/develop
Commit: ef113cd2dae393ae5ceb2e34254c3882bbb0527d
Parents: e3059d6 f7cc0bc
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Feb 25 16:53:57 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Feb 25 16:53:57 2014 +0100
----------------------------------------------------------------------
.../org/apache/marmotta/ldpath/parser/ldpath.jj | 1106 ++++++++++++++++++
.../apache/marmotta/ldpath/parser/rdfpath.jj | 1104 -----------------
.../marmotta/loader/statistics/Statistics.java | 74 +-
.../loader/core/test/LoaderTestBase.java | 7 +-
.../core/test/dummy/DummyLoaderBackend.java | 4 +-
.../core/test/dummy/DummyLoaderHandler.java | 17 +-
6 files changed, 1173 insertions(+), 1139 deletions(-)
----------------------------------------------------------------------
Re: [2/3] git commit: MARMOTTA-431: fixed version generation, both
for snapshots and releases
Posted by Sergio Fernández <se...@salzburgresearch.at>.
For fitting into the Debian versioning, bot with releases and snapshots.
If you know a better way to do it, whatever simplifies that would be
welcomed ;-)
On 25/02/14 20:57, Jakob Frank wrote:
> Why messing around with version numbers?
>
> Best,
> Jakob
>
> On 25 February 2014 16:54, <wi...@apache.org> wrote:
>> MARMOTTA-431: fixed version generation, both for snapshots and releases
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e3059d65
>> Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e3059d65
>> Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e3059d65
>>
>> Branch: refs/heads/develop
>> Commit: e3059d659fa20c17a4b2dd69c7b2dfb2c10574ac
>> Parents: 7496b4f
>> Author: Sergio Fernández <wi...@apache.org>
>> Authored: Tue Feb 25 16:53:40 2014 +0100
>> Committer: Sergio Fernández <wi...@apache.org>
>> Committed: Tue Feb 25 16:53:40 2014 +0100
>>
>> ----------------------------------------------------------------------
>> launchers/marmotta-webapp/pom.xml | 26 +++++++++++++++-----------
>> parent/pom.xml | 5 +++++
>> 2 files changed, 20 insertions(+), 11 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/launchers/marmotta-webapp/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
>> index 748e486..03cb4fd 100644
>> --- a/launchers/marmotta-webapp/pom.xml
>> +++ b/launchers/marmotta-webapp/pom.xml
>> @@ -121,16 +121,20 @@
>> </configuration>
>> </plugin>
>> <plugin>
>> - <groupId>org.codehaus.mojo</groupId>
>> - <artifactId>build-helper-maven-plugin</artifactId>
>> - <version>1.8</version>
>> + <groupId>org.codehaus.gmaven</groupId>
>> + <artifactId>gmaven-plugin</artifactId>
>> <executions>
>> - <execution>
>> - <id>parse-version</id>
>> - <goals>
>> - <goal>parse-version</goal>
>> - </goals>
>> - </execution>
>> + <execution>
>> + <phase>generate-sources</phase>
>> + <goals>
>> + <goal>execute</goal>
>> + </goals>
>> + <configuration>
>> + <source>
>> + project.properties.setProperty("version.clean", "${project.version}".replace('-SNAPSHOT', '-${maven.build.timestamp}'))
>> + </source>
>> + </configuration>
>> + </execution>
>> </executions>
>> </plugin>
>> <plugin>
>> @@ -145,8 +149,8 @@
>> <goal>jdeb</goal>
>> </goals>
>> <configuration>
>> - <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
>> - <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
>> + <deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
>> + <changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
>> <controlDir>${basedir}/src/deb/control</controlDir>
>> <dataSet>
>> <data>
>>
>> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/parent/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/parent/pom.xml b/parent/pom.xml
>> index a6b1414..62d30cb 100644
>> --- a/parent/pom.xml
>> +++ b/parent/pom.xml
>> @@ -575,6 +575,11 @@
>> <jswarn>false</jswarn>
>> </configuration>
>> </plugin>
>> + <plugin>
>> + <groupId>org.codehaus.gmaven</groupId>
>> + <artifactId>gmaven-plugin</artifactId>
>> + <version>1.5</version>
>> + </plugin>
>> </plugins>
>> </pluginManagement>
>> <plugins>
>>
--
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at
Re: [2/3] git commit: MARMOTTA-431: fixed version generation, both
for snapshots and releases
Posted by Jakob Frank <ja...@apache.org>.
Why messing around with version numbers?
Best,
Jakob
On 25 February 2014 16:54, <wi...@apache.org> wrote:
> MARMOTTA-431: fixed version generation, both for snapshots and releases
>
>
> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
> Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e3059d65
> Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e3059d65
> Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e3059d65
>
> Branch: refs/heads/develop
> Commit: e3059d659fa20c17a4b2dd69c7b2dfb2c10574ac
> Parents: 7496b4f
> Author: Sergio Fernández <wi...@apache.org>
> Authored: Tue Feb 25 16:53:40 2014 +0100
> Committer: Sergio Fernández <wi...@apache.org>
> Committed: Tue Feb 25 16:53:40 2014 +0100
>
> ----------------------------------------------------------------------
> launchers/marmotta-webapp/pom.xml | 26 +++++++++++++++-----------
> parent/pom.xml | 5 +++++
> 2 files changed, 20 insertions(+), 11 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/launchers/marmotta-webapp/pom.xml
> ----------------------------------------------------------------------
> diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
> index 748e486..03cb4fd 100644
> --- a/launchers/marmotta-webapp/pom.xml
> +++ b/launchers/marmotta-webapp/pom.xml
> @@ -121,16 +121,20 @@
> </configuration>
> </plugin>
> <plugin>
> - <groupId>org.codehaus.mojo</groupId>
> - <artifactId>build-helper-maven-plugin</artifactId>
> - <version>1.8</version>
> + <groupId>org.codehaus.gmaven</groupId>
> + <artifactId>gmaven-plugin</artifactId>
> <executions>
> - <execution>
> - <id>parse-version</id>
> - <goals>
> - <goal>parse-version</goal>
> - </goals>
> - </execution>
> + <execution>
> + <phase>generate-sources</phase>
> + <goals>
> + <goal>execute</goal>
> + </goals>
> + <configuration>
> + <source>
> + project.properties.setProperty("version.clean", "${project.version}".replace('-SNAPSHOT', '-${maven.build.timestamp}'))
> + </source>
> + </configuration>
> + </execution>
> </executions>
> </plugin>
> <plugin>
> @@ -145,8 +149,8 @@
> <goal>jdeb</goal>
> </goals>
> <configuration>
> - <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
> - <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
> + <deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
> + <changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
> <controlDir>${basedir}/src/deb/control</controlDir>
> <dataSet>
> <data>
>
> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index a6b1414..62d30cb 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -575,6 +575,11 @@
> <jswarn>false</jswarn>
> </configuration>
> </plugin>
> + <plugin>
> + <groupId>org.codehaus.gmaven</groupId>
> + <artifactId>gmaven-plugin</artifactId>
> + <version>1.5</version>
> + </plugin>
> </plugins>
> </pluginManagement>
> <plugins>
>
[2/3] git commit: MARMOTTA-431: fixed version generation,
both for snapshots and releases
Posted by wi...@apache.org.
MARMOTTA-431: fixed version generation, both for snapshots and releases
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e3059d65
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e3059d65
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e3059d65
Branch: refs/heads/develop
Commit: e3059d659fa20c17a4b2dd69c7b2dfb2c10574ac
Parents: 7496b4f
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Feb 25 16:53:40 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Feb 25 16:53:40 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 26 +++++++++++++++-----------
parent/pom.xml | 5 +++++
2 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 748e486..03cb4fd 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -121,16 +121,20 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
<executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ project.properties.setProperty("version.clean", "${project.version}".replace('-SNAPSHOT', '-${maven.build.timestamp}'))
+ </source>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -145,8 +149,8 @@
<goal>jdeb</goal>
</goals>
<configuration>
- <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
- <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
+ <deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
+ <changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
<controlDir>${basedir}/src/deb/control</controlDir>
<dataSet>
<data>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a6b1414..62d30cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -575,6 +575,11 @@
<jswarn>false</jswarn>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>