commonsrdf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject incubator-commonsrdf git commit: remove java6 profile that isn't supported anymore
Date Sat, 28 Mar 2015 04:14:37 GMT
Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 5f63cac0d -> b773bbff6


remove java6 profile that isn't supported anymore

also fix the junit dependency from the pom.xml file and move it to dependencyManagement to
ensure the pom has no incorrect direct dependencies


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

Branch: refs/heads/master
Commit: b773bbff6bce9b52ba17c5bbbef3fd3af2f92e13
Parents: 5f63cac
Author: Peter Ansell <p_ansell@yahoo.com>
Authored: Sat Mar 28 15:10:33 2015 +1100
Committer: Peter Ansell <p_ansell@yahoo.com>
Committed: Sat Mar 28 15:13:50 2015 +1100

----------------------------------------------------------------------
 api/pom.xml    | 73 ++++++-----------------------------------------------
 pom.xml        | 20 +++++++--------
 simple/pom.xml |  5 ++++
 3 files changed, 23 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b773bbff/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 99c9b05..534fe09 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,69 +32,12 @@
 
     <name>Commons RDF: API</name>
     <description>Commons Java API for RDF 1.1</description>
-
-    <profiles>
-        <profile>
-            <id>java6</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-patch-plugin</artifactId>
-                        <version>1.1.1</version>
-                        <configuration>
-                            <strip>5</strip>
-                            <patches>
-                                <patch>java6.patch</patch>
-                            </patches>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>patch</id>
-                                <phase>process-sources</phase>
-                                <goals>
-                                    <goal>apply</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.3.1</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <executable>git</executable>
-                            <arguments>
-                                <argument>checkout</argument>
-                                <argument>src/main/java/com/github/commonsrdf/api/Graph.java</argument>
-                                <argument>src/main/java/com/github/commonsrdf/api/Literal.java</argument>
-                                <argument>src/main/java/com/github/commonsrdf/api/RDFTermFactory.java</argument>
-                            </arguments>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                    <version>17.0</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>com.google.code.findbugs</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
+	
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+	</dependency>
+    </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b773bbff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e4578cd..1089861 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,16 @@
       <module>simple</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <plugins>
             <plugin>
@@ -260,14 +270,4 @@
 		</pluginManagement>
     </build>
 
-    <dependencies>
-      <!-- Common dependencies - should really only be junit -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b773bbff/simple/pom.xml
----------------------------------------------------------------------
diff --git a/simple/pom.xml b/simple/pom.xml
index 770611e..b295e15 100644
--- a/simple/pom.xml
+++ b/simple/pom.xml
@@ -46,6 +46,11 @@
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>


Mime
View raw message