marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject [37/50] [abbrv] marmotta git commit: MARMOTTA-510: Streamlining several POMs: * Moved dependency-version to the parent-pom: - org.tukaani:xz - squebi - sgwizler * Added explicit links to parent poms. * Install and deploy the maven-plugins par
Date Fri, 05 Dec 2014 15:36:46 GMT
MARMOTTA-510: Streamlining several POMs:
 * Moved dependency-version to the parent-pom:
   - org.tukaani:xz
   - squebi
   - sgwizler
 * Added explicit links to parent poms.
 * Install and deploy the maven-plugins parent-pom.


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f47513c5
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f47513c5
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f47513c5

Branch: refs/heads/master
Commit: f47513c5bc8390660964fa76e241e2afe4cf94ae
Parents: eda8f18
Author: Jakob Frank <jakob@apache.org>
Authored: Fri Nov 28 13:55:08 2014 +0100
Committer: Jakob Frank <jakob@apache.org>
Committed: Tue Dec 2 09:11:58 2014 +0100

----------------------------------------------------------------------
 build/plugins/pom.xml                         | 14 --------------
 libraries/kiwi/kiwi-caching-ehcache/pom.xml   |  1 +
 libraries/kiwi/kiwi-caching-hazelcast/pom.xml |  1 +
 loader/marmotta-loader-core/pom.xml           |  1 -
 parent/pom.xml                                | 17 +++++++++++++++++
 platform/marmotta-sparql/pom.xml              |  2 --
 6 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 158bdab..709d8f8 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -99,20 +99,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- 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.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/libraries/kiwi/kiwi-caching-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-caching-ehcache/pom.xml b/libraries/kiwi/kiwi-caching-ehcache/pom.xml
index 52408a0..031b367 100644
--- a/libraries/kiwi/kiwi-caching-ehcache/pom.xml
+++ b/libraries/kiwi/kiwi-caching-ehcache/pom.xml
@@ -23,6 +23,7 @@
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>kiwi-caching-ehcache</artifactId>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/libraries/kiwi/kiwi-caching-hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-caching-hazelcast/pom.xml b/libraries/kiwi/kiwi-caching-hazelcast/pom.xml
index 478797f..0afebf9 100644
--- a/libraries/kiwi/kiwi-caching-hazelcast/pom.xml
+++ b/libraries/kiwi/kiwi-caching-hazelcast/pom.xml
@@ -23,6 +23,7 @@
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>kiwi-caching-hazelcast</artifactId>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/loader/marmotta-loader-core/pom.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-core/pom.xml b/loader/marmotta-loader-core/pom.xml
index 42318a6..d73629e 100644
--- a/loader/marmotta-loader-core/pom.xml
+++ b/loader/marmotta-loader-core/pom.xml
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>org.tukaani</groupId>
             <artifactId>xz</artifactId>
-            <version>1.5</version>
         </dependency>
 
         <!-- Performance Statistics -->

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d557fc..0047f1e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -662,6 +662,11 @@
                 <version>1.8.1</version>
             </dependency>
             <dependency>
+                <groupId>org.tukaani</groupId>
+                <artifactId>xz</artifactId>
+                <version>1.5</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
                 <version>4.3.2</version>
@@ -995,6 +1000,12 @@
                 <scope>runtime</scope>
             </dependency>
             <dependency>
+                <groupId>com.github.tkurz.webjars</groupId>
+                <artifactId>squebi</artifactId>
+                <version>1.0.1</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.webjars</groupId>
                 <artifactId>requirejs</artifactId>
                 <version>2.1.15</version>
@@ -1019,6 +1030,12 @@
                 <scope>runtime</scope>
             </dependency>
             <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>sgvizler</artifactId>
+                <version>0.6</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.marmotta.webjars</groupId>
                 <artifactId>codemirror-modes</artifactId>
                 <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f47513c5/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index c9a755b..6995ea8 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -178,7 +178,6 @@
         <dependency>
             <groupId>com.github.tkurz.webjars</groupId>
             <artifactId>squebi</artifactId>
-            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -191,7 +190,6 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>sgvizler</artifactId>
-            <version>0.6</version>
             <scope>runtime</scope>
         </dependency>
 


Mime
View raw message