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/07/09 12:01:55 UTC
git commit: - fixed versions of webjars so they won't deploy to the
release repository when we are still developing snapshots
Updated Branches:
refs/heads/develop fb5776427 -> 12e7195ec
- fixed versions of webjars so they won't deploy to the release repository when we are still developing snapshots
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/12e7195e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/12e7195e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/12e7195e
Branch: refs/heads/develop
Commit: 12e7195ec179101133c4862fb8790bb6d14593c1
Parents: fb57764
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Jul 9 12:01:22 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Jul 9 12:01:22 2013 +0200
----------------------------------------------------------------------
extras/webjars/codemirror/pom.xml | 12 ++++++++----
extras/webjars/sgvizler/pom.xml | 9 ++++++---
extras/webjars/snorql/pom.xml | 12 ++++++++----
extras/webjars/strftime/pom.xml | 10 +++++++---
parent/pom.xml | 8 ++++----
5 files changed, 33 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/12e7195e/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index d459b71..4498287 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -10,9 +10,13 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
+ <properties>
+ <webjar.version>2.24</webjar.version>
+ </properties>
+
+
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>codemirror</artifactId>
- <version>2.24</version>
<packaging>jar</packaging>
@@ -30,7 +34,7 @@
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/codemirror.js</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/codemirror.js</output>
</configuration>
</execution>
<execution>
@@ -40,7 +44,7 @@
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/codemirror.css</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/codemirror.css</output>
</configuration>
</execution>
</executions>
@@ -54,7 +58,7 @@
<exclude>**/*.css</exclude>
</excludes>
<filtering>false</filtering>
- <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</targetPath>
+ <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</targetPath>
</resource>
</resources>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/12e7195e/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 73ef370..ca2c230 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -10,9 +10,12 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
+ <properties>
+ <webjar.version>0.5.1</webjar.version>
+ </properties>
+
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>sgvizler</artifactId>
- <version>0.5.1</version>
<packaging>jar</packaging>
@@ -32,7 +35,7 @@
<configuration>
<nomunge>true</nomunge>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/sgvizler.js</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/sgvizler.js</output>
</configuration>
</plugin>
</plugins>
@@ -43,7 +46,7 @@
<exclude>**/*.js</exclude>
</excludes>
<filtering>false</filtering>
- <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</targetPath>
+ <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</targetPath>
</resource>
</resources>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/12e7195e/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index ed52758..4dd4c4d 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -10,9 +10,13 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
+ <properties>
+ <webjar.version>1.0</webjar.version>
+ </properties>
+
+
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>snorql</artifactId>
- <version>1.0</version>
<packaging>jar</packaging>
@@ -31,7 +35,7 @@
<configuration>
<nomunge>true</nomunge>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/snorql.js</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/snorql.js</output>
<includes>
<include>prototype.js</include>
<include>scriptaculous/scriptaculous.js</include>
@@ -54,7 +58,7 @@
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/snorql.css</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/snorql.css</output>
</configuration>
</execution>
</executions>
@@ -68,7 +72,7 @@
<exclude>**/*.css</exclude>
</excludes>
<filtering>false</filtering>
- <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</targetPath>
+ <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</targetPath>
</resource>
</resources>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/12e7195e/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 21ff8a6..e7c1391 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -10,9 +10,13 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
+ <properties>
+ <webjar.version>1.3</webjar.version>
+ </properties>
+
+
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>strftime</artifactId>
- <version>1.3</version>
<packaging>jar</packaging>
@@ -32,7 +36,7 @@
<configuration>
<nomunge>true</nomunge>
<sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
- <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/strftime.js</output>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/strftime.js</output>
</configuration>
</plugin>
</plugins>
@@ -43,7 +47,7 @@
<exclude>**/*.js</exclude>
</excludes>
<filtering>false</filtering>
- <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</targetPath>
+ <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</targetPath>
</resource>
</resources>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/12e7195e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b780d80..8d429e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -918,22 +918,22 @@
<dependency>
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>codemirror</artifactId>
- <version>2.24</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>snorql</artifactId>
- <version>1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>sgvizler</artifactId>
- <version>0.5.1</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta.webjars</groupId>
<artifactId>strftime</artifactId>
- <version>1.3</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>