Commits

Anonymous committed 850460d

reboot build system

  • Participants
  • Parent commits 1b65054
  • Branches 1.2, 1.3 1
    1. 1.4

Comments (0)

Files changed (7)

org.openscada.opc.dcom/pom.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.openscada.utgard-parent</artifactId>
+    <artifactId>parent</artifactId>
     <groupId>org.openscada.utgard</groupId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../builder_utgard</relativePath>
+    <relativePath>../org.openscada.utgard-parent</relativePath>
   </parent>
   <groupId>org.openscada.utgard</groupId>
   <artifactId>org.openscada.opc.dcom</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
+</project>

org.openscada.opc.lib/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.openscada.opc.lib
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: openSCADA Utgard Library
 Bundle-Vendor: openSCADA.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

org.openscada.opc.lib/pom.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.openscada.utgard-parent</artifactId>
+    <artifactId>parent</artifactId>
     <groupId>org.openscada.utgard</groupId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../builder_utgard</relativePath>
+    <relativePath>../org.openscada.utgard-parent</relativePath>
   </parent>
   <groupId>org.openscada.utgard</groupId>
   <artifactId>org.openscada.opc.lib</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
+</project>

org.openscada.utgard-parent/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openscada.utgard-parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

org.openscada.utgard-parent/pom.xml

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+
+	<parent>
+		<groupId>org.openscada</groupId>
+		<artifactId>superParent</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>org.openscada</id>
+			<url>http://neutronium.openscada.org/maven</url>
+		</repository>
+	</repositories>
+
+	<groupId>org.openscada.utgard</groupId>
+	<artifactId>parent</artifactId>
+	<packaging>pom</packaging>
+
+	<properties>
+		<tycho.scmUrl>scm:git:git://git.openscada.org/org.openscada.utgard.git</tycho.scmUrl>
+	</properties>
+
+	<modules>
+		<module>../org.openscada.utgard.feature</module>
+		<module>../org.openscada.utgard.sdk.feature</module>
+
+		<module>../org.openscada.opc.dcom</module>
+		<module>../org.openscada.opc.lib</module>
+	</modules>
+
+</project>

org.openscada.utgard.feature/pom.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.openscada.utgard-parent</artifactId>
+		<artifactId>parent</artifactId>
 		<groupId>org.openscada.utgard</groupId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../builder_utgard</relativePath>
+		<relativePath>../org.openscada.utgard-parent</relativePath>
 	</parent>
-
 	<groupId>org.openscada.utgard.features</groupId>
 	<artifactId>org.openscada.utgard</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<!-- source features -->
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tychoExtrasVersion}</version>
+				<version>${tycho-extras-version}</version>
 				<executions>
 					<execution>
 						<id>source-feature</id>
 			</plugin>
 		</plugins>
 	</build>
-
-</project>
+</project>

org.openscada.utgard.sdk.feature/pom.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.openscada.utgard-parent</artifactId>
+    <artifactId>parent</artifactId>
     <groupId>org.openscada.utgard</groupId>
-    <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../builder_utgard</relativePath>
+  	<version>1.2.0-SNAPSHOT</version>
+    <relativePath>../org.openscada.utgard-parent</relativePath>
   </parent>
   <groupId>org.openscada.utgard.features</groupId>
   <artifactId>org.openscada.utgard.sdk</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
+</project>