Browse Source

Remove unnecessary frontend.parent-pom

Mathias Landhäußer 11 years ago
parent
commit
34ebee615b

+ 0 - 29
jplag.frontend-parent/pom.xml

@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>edu.kit.ipd.jplag.frontend</groupId>
-	<artifactId>frontend-parent</artifactId>
-	<version>0.3-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>edu.kit.ipd.jplag</groupId>
-		<artifactId>parent</artifactId>
-		<version>0.3-SNAPSHOT</version>
-	</parent>
-
-	<scm>
-		<connection>scm:svn:https://svn.ipd.kit.edu/repos/jplag/jplag.frontend.parent/trunk</connection>
-		<tag>HEAD</tag>
-	</scm>
-
-	<repositories>
-		<repository>
-			<id>ipdNexus</id>
-			<name>Recaa Repository</name>
-			<url>http://bob.ipd.kit.edu/nexus/content/repositories/public/</url>
-		</repository>
-	</repositories>
-
-	<name>JPlag</name>
-</project>

+ 2 - 2
jplag.frontend.chars/pom.xml

@@ -35,8 +35,8 @@
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>chars</artifactId>

+ 2 - 6
jplag.frontend.cpp/pom.xml

@@ -107,12 +107,8 @@
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<project.build.source>1.6</project.build.source>
-		<project.build.target>1.6</project.build.target>
-	</properties>
 </project>

+ 2 - 3
jplag.frontend.csharp-1.2/pom.xml

@@ -76,12 +76,11 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 2 - 3
jplag.frontend.java-1.1exp/pom.xml

@@ -106,12 +106,11 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 3 - 4
jplag.frontend.java-1.2/pom.xml

@@ -78,12 +78,11 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
-		<version>0.2-SNAPSHOT</version>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 2 - 3
jplag.frontend.java-1.5/pom.xml

@@ -72,12 +72,11 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>java-1.5</artifactId>

+ 3 - 5
jplag.frontend.java-1.7/pom.xml

@@ -80,22 +80,20 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>java-1.5</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 2 - 2
jplag.frontend.scheme/pom.xml

@@ -120,8 +120,8 @@
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 2 - 3
jplag.frontend.text/pom.xml

@@ -77,12 +77,11 @@
 		<dependency>
 			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>frontend-utils</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<parent>
-		<groupId>edu.kit.ipd.jplag.frontend</groupId>
-		<artifactId>frontend-parent</artifactId>
+		<groupId>edu.kit.ipd.jplag</groupId>
+		<artifactId>parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 	</parent>
 </project>

+ 5 - 1
jplag.parent/pom.xml

@@ -283,7 +283,11 @@
 				<artifactId>jplag</artifactId>
 				<version>2.11.8-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>edu.kit.ipd.jplag</groupId>
+				<artifactId>java-1.5</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	<name>JPlag</name>
 </project>

+ 8 - 8
jplag/pom.xml

@@ -185,7 +185,7 @@
 			<artifactId>frontend-utils</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>java-1.1exp</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
@@ -194,37 +194,37 @@
 			<artifactId>utils</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>text</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>java-1.5</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>java-1.7</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>csharp-1.2</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>cpp</artifactId>
 			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>scheme</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.kit.ipd.jplag.frontend</groupId>
+			<groupId>edu.kit.ipd.jplag</groupId>
 			<artifactId>chars</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>

+ 34 - 0
pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>edu.kit.ipd.jplag</groupId>
+	<artifactId>aggregator</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<name>JPlag Aggregator</name>
+	<modules>
+		<module>jplag.parent</module>
+		<module>jplag.frontend-utils</module>
+		<module>jplag.frontend.chars</module>
+		<module>jplag.frontend.cpp</module>
+		<module>jplag.frontend.csharp-1.2</module>
+		<module>jplag.frontend.java-1.1exp</module>
+		<module>jplag.frontend.java-1.2</module>
+		<module>jplag.frontend.java-1.5</module>
+		<module>jplag.frontend.java-1.7</module>
+		<module>jplag.frontend.scheme</module>
+		<module>jplag.frontend.text</module>
+		<module>jplag.utils</module>
+		<module>jplag</module>
+	</modules>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>edu.kit.ipd.jplag</groupId>
+				<artifactId>java-1.5</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</project>