1. Jens Reimann
  2. org.openscada.builder

Commits

Jens Reimann  committed 1727b98

create apt and upload, create rpms, create yum and upload

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

Comments (0)

Files changed (17)

File aggregator/.gitignore

View file
  • Ignore whitespace
+target/

File aggregator/deb/.gitignore

  • Ignore whitespace
-target/

File aggregator/deb/apt/pom.xml

View file
  • Ignore whitespace
+<?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>deb</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.openscada</groupId>
+	<artifactId>apt</artifactId>
+	<packaging>pom</packaging>
+
+	<description>openSCADA</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openscada.deb</groupId>
+			<artifactId>org.openscada.p2</artifactId>
+			<type>deb</type>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openscada.deb</groupId>
+			<artifactId>org.openscada.jdbc.postgres</artifactId>
+			<type>deb</type>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<configuration>
+							<target>
+								<mkdir dir="${project.build.directory}/debs" />
+								<copy todir="${project.build.directory}/debs" flatten="true">
+									<fileset dir="${basedir}/../p2/target" includes="**/*.deb" />
+									<fileset dir="${basedir}/../postgres/target" includes="**/*.deb" />
+								</copy>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>de.dentrassi.build</groupId>
+				<artifactId>apt-repo</artifactId>
+
+				<executions>
+					<execution>
+						<id>apt</id>
+						<phase>package</phase>
+						<goals>
+							<goal>apt</goal>
+						</goals>
+						<configuration>
+							<sourceDirectory>${project.build.directory}/debs</sourceDirectory>
+							<distributionName>default</distributionName>
+							<architectures>
+								<architecture>i386</architecture>
+								<architecture>amd64</architecture>
+								<architecture>armhf</architecture>
+							</architectures>
+						</configuration>
+					</execution>
+				</executions>
+
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>sshexec</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org</url>
+							<commands>
+								<command>rm -Rf "/neutronium.openscada.org/apt/${openscada.release}/${openscada.releaseType}"</command>
+							</commands>
+						</configuration>
+					</execution>
+					<execution>
+						<id>upload</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org/neutronium.openscada.org/apt/${openscada.release}/${openscada.releaseType}</url>
+							<fromDir>${project.build.directory}/apt</fromDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

File aggregator/deb/p2/pom.xml

View file
  • Ignore whitespace
 		<relativePath>..</relativePath>
 	</parent>
 
-	<groupId>org.openscada</groupId>
+	<groupId>org.openscada.deb</groupId>
 	<artifactId>org.openscada.p2</artifactId>
 	<packaging>deb</packaging>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openscada</groupId>
-			<artifactId>p2</artifactId>
+			<groupId>org.openscada.p2</groupId>
+			<artifactId>org.openscada</artifactId>
 			<version>${project.version}</version>
+			<type>zip</type>
 		</dependency>
 	</dependencies>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>copy-p2</id>
-						<phase>package</phase>
+						<phase>compile</phase>
 						<goals>
 							<goal>copy</goal>
 						</goals>
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openscada</groupId>
-									<artifactId>p2</artifactId>
+									<groupId>org.openscada.p2</groupId>
+									<artifactId>org.openscada</artifactId>
 									<version>${project.version}</version>
 									<type>zip</type>
 								</artifactItem>
 			<plugin>
 				<artifactId>jdeb</artifactId>
 				<groupId>org.vafer</groupId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jdeb</goal>
-						</goals>
-						<configuration>
-							<dataSet>
-								<data>
-									<src>${project.build.directory}/data/p2.zip</src>
-									<type>archive</type>
-									<mapper>
-										<type>perm</type>
-										<prefix>/usr/share/eclipsescada/p2/org.openscada</prefix>
-									</mapper>
-								</data>
-							</dataSet>
-						</configuration>
-					</execution>
-				</executions>
+				<configuration>
+					<snapshotExpand>true</snapshotExpand>
+					<dataSet>
+						<data>
+							<src>${project.build.directory}/data/org.openscada.zip</src>
+							<type>archive</type>
+							<mapper>
+								<type>perm</type>
+								<prefix>/usr/share/eclipsescada/p2/org.openscada</prefix>
+							</mapper>
+						</data>
+					</dataSet>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

File aggregator/deb/pom.xml

View file
  • Ignore whitespace
 	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>aggregator</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
 	<groupId>org.openscada</groupId>
 	<artifactId>deb</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.openscada</groupId>
-			<artifactId>p2</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
 	<modules>
 		<module>postgres</module>
 		<module>p2</module>
+		<module>apt</module>
 	</modules>
 
 	<build>
 			<extension>
 				<groupId>org.vafer</groupId>
 				<artifactId>jdeb</artifactId>
-				<version>1.2</version>
 			</extension>
 		</extensions>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 
 </project>

File aggregator/deb/postgres/pom.xml

View file
  • Ignore whitespace
 		<relativePath>..</relativePath>
 	</parent>
 
-	<groupId>org.openscada</groupId>
+	<groupId>org.openscada.deb</groupId>
 	<artifactId>org.openscada.jdbc.postgres</artifactId>
 	<packaging>deb</packaging>
 
 				<executions>
 					<execution>
 						<id>copy-postgres</id>
-						<phase>package</phase>
+						<phase>compile</phase>
 						<goals>
 							<goal>copy</goal>
 						</goals>
 			<plugin>
 				<artifactId>jdeb</artifactId>
 				<groupId>org.vafer</groupId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jdeb</goal>
-						</goals>
-						<configuration>
-							<dataSet>
-								<data>
-									<src>${project.build.directory}/jar</src>
-									<type>directory</type>
-									<includes>*.jar</includes>
-									<mapper>
-										<type>perm</type>
-										<prefix>/usr/jar</prefix>
-									</mapper>
-								</data>
-							</dataSet>
-						</configuration>
-					</execution>
-				</executions>
+				<configuration>
+					<snapshotExpand>true</snapshotExpand>
+					<dataSet>
+						<data>
+							<src>${project.build.directory}/jar</src>
+							<type>directory</type>
+							<includes>*.jar</includes>
+							<mapper>
+								<type>perm</type>
+								<prefix>/usr/jar</prefix>
+							</mapper>
+						</data>
+					</dataSet>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

File aggregator/deploy/pom.xml

View file
  • Ignore whitespace
+<?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>aggregator</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<groupId>org.openscada</groupId>
+	<artifactId>deploy</artifactId>
+	<packaging>pom</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openscada</groupId>
+			<artifactId>p2</artifactId>
+			<version>${project.version}</version>
+			<type>zip</type>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-p2</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.openscada.p2</groupId>
+									<artifactId>org.openscada</artifactId>
+									<version>${project.version}</version>
+									<type>zip</type>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/zip</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<configuration>
+							<target>
+								<mkdir dir="${project.build.directory}/p2" />
+								<unzip dest="${project.build.directory}/p2">
+									<fileset dir="${project.build.directory}/zip" includes="*.zip" />
+								</unzip>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>sshexec</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org</url>
+							<commands>
+								<command>rm -Rf "/neutronium.openscada.org/download/${openscada.release}/${openscada.releaseType}"</command>
+								<command>rm -Rf "/neutronium.openscada.org/p2/${openscada.release}/${openscada.releaseType}"</command>
+							</commands>
+						</configuration>
+					</execution>
+					<execution>
+						<id>upload-zip</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org/neutronium.openscada.org/download/${openscada.release}/${openscada.releaseType}</url>
+							<fromDir>${project.build.directory}/zip</fromDir>
+						</configuration>
+					</execution>
+					<execution>
+						<id>upload-p2</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org/neutronium.openscada.org/p2/${openscada.release}/${openscada.releaseType}</url>
+							<fromDir>${project.build.directory}/p2</fromDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

File aggregator/pom.xml

View file
  • Ignore whitespace
 	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>
+
 	<groupId>org.openscada</groupId>
 	<artifactId>aggregator</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
 		<module>../../org.openscada.jinterop/org.openscada.jinterop-parent</module>
 		<module>../../org.openscada.utgard/org.openscada.utgard-parent</module>
 		<module>../../org.openscada.atlantis/org.openscada.atlantis-parent</module>
+		<module>../../org.openscada.ide/org.openscada.ide-parent</module>
 		<module>deb</module>
+		<module>rpm</module>
+		<module>deploy</module>
 	</modules>
 
 	<build>
 					<version>2.8</version>
 				</plugin>
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.1</version>
+				</plugin>
+				<plugin>
 					<artifactId>jdeb</artifactId>
 					<groupId>org.vafer</groupId>
 					<version>1.2</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>wagon-maven-plugin</artifactId>
+					<version>1.0-beta-5</version>
+				</plugin>
+				<plugin>
+					<groupId>de.dentrassi.build</groupId>
+					<artifactId>apt-repo</artifactId>
+					<version>0.0.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>rpm-maven-plugin</artifactId>
+					<version>2.1-alpha-4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.3.1</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>

File aggregator/rpm/p2/pom.xml

View file
  • Ignore whitespace
+<?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>rpm</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<groupId>org.openscada.rpm</groupId>
+	<artifactId>org.openscada.p2</artifactId>
+	<packaging>pom</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openscada.p2</groupId>
+			<artifactId>org.openscada</artifactId>
+			<version>${project.version}</version>
+			<type>zip</type>
+		</dependency>
+	</dependencies>
+
+	<build>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-postgres</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.openscada.p2</groupId>
+									<artifactId>org.openscada</artifactId>
+									<version>${project.version}</version>
+									<type>zip</type>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/zip</outputDirectory>
+							<stripVersion>true</stripVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<configuration>
+							<target>
+								<mkdir dir="${project.build.directory}/data" />
+								<unzip src="${project.build.directory}/zip/org.openscada.zip" dest="${project.build.directory}/data" />
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>rpm-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-rpm</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attached-rpm</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<license>LGPL</license>
+					<distribution>openSCADA</distribution>
+					<group>Application/System</group>
+					<packager>openSCADA</packager>
+					<prefix>/usr/local</prefix>
+					<defineStatements>
+						<defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
+					</defineStatements>
+					<mappings>
+						<mapping>
+							<directory>/usr/share/eclipsescada/p2/org.openscada</directory>
+							<sources>
+								<source>
+									<location>target/data</location>
+								</source>
+							</sources>
+						</mapping>
+					</mappings>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+</project>

File aggregator/rpm/pom.xml

View file
  • Ignore whitespace
+<?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>aggregator</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.openscada</groupId>
+	<artifactId>rpm</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>p2</module>
+		<module>postgres</module>
+		<module>yum</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

File aggregator/rpm/postgres/pom.xml

View file
  • Ignore whitespace
+<?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>rpm</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<groupId>org.openscada.rpm</groupId>
+	<artifactId>org.openscada.jdbc.postgres</artifactId>
+	<packaging>pom</packaging>
+
+	<build>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-postgres</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.postgresql</groupId>
+									<artifactId>postgresql</artifactId>
+									<version>9.3-1101-jdbc41</version>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/jar</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			
+			 <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>rpm-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-rpm</id>
+                       	<phase>package</phase>
+                        <goals>
+                            <goal>attached-rpm</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <license>LGPL</license>
+                    <distribution>openSCADA</distribution>
+                    <group>Application/System</group>
+                    <packager>openSCADA</packager>
+                    <prefix>/usr/jar</prefix>
+                    <defineStatements>
+                       <defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
+                    </defineStatements>
+                    <mappings>
+                        <mapping>
+                            <directory>/usr/jar</directory>
+                            <sources>
+                                <source>
+                                    <location>target/jar</location>
+                                </source>
+                            </sources>
+                        </mapping>
+                    </mappings>
+                </configuration>
+            </plugin>
+
+		</plugins>
+	</build>
+</project>

File aggregator/rpm/yum/pom.xml

View file
  • Ignore whitespace
+<?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>rpm</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.openscada</groupId>
+	<artifactId>yum</artifactId>
+	<packaging>pom</packaging>
+
+	<description>openSCADA</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openscada.rpm</groupId>
+			<artifactId>org.openscada.p2</artifactId>
+			<classifier>rpm</classifier>
+			<type>rpm</type>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openscada.rpm</groupId>
+			<artifactId>org.openscada.jdbc.postgres</artifactId>
+			<classifier>rpm</classifier>
+			<type>rpm</type>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="${project.build.directory}/repo" />
+								<copy todir="${project.build.directory}/repo" flatten="true">
+									<fileset dir="${basedir}/../p2/target/rpm" includes="**/*.rpm" />
+									<fileset dir="${basedir}/../postgres/target/rpm"
+										includes="**/*.rpm" />
+								</copy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</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>
+						<configuration>
+							<executable>createrepo</executable>
+							<workingDirectory>${project.build.directory}/repo</workingDirectory>
+							<arguments>
+								<argument>.</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>sshexec</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org</url>
+							<commands>
+								<command>rm -Rf "/neutronium.openscada.org/yum/${openscada.release}/${openscada.releaseType}"</command>
+							</commands>
+						</configuration>
+					</execution>
+					<execution>
+						<id>upload</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+						<configuration>
+							<serverId>openscada-neutronium</serverId>
+							<url>scpexe://openscada.org/neutronium.openscada.org/yum/${openscada.release}/${openscada.releaseType}</url>
+							<fromDir>${project.build.directory}/repo</fromDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

File org.openscada-p2/category.xml

View file
  • Ignore whitespace
    <feature url="features/org.openscada.utgard.sdk_1.2.0.qualifier.jar" id="org.openscada.utgard.sdk" version="1.2.0.qualifier">
       <category name="org.openscada.sdk.category"/>
    </feature>
+   <feature url="features/org.openscada.configuration.opc_1.2.0.qualifier.jar" id="org.openscada.configuration.opc" version="1.2.0.qualifier">
+      <category name="org.openscada.category"/>
+   </feature>
+   <feature url="features/org.openscada.configuration.snmp_1.2.0.qualifier.jar" id="org.openscada.configuration.snmp" version="1.2.0.qualifier">
+      <category name="org.openscada.category"/>
+   </feature>
+   <feature url="features/org.openscada.ide_1.2.0.qualifier.jar" id="org.openscada.ide" version="1.2.0.qualifier">
+      <category name="org.openscada.category"/>
+   </feature>
+   <feature url="features/org.openscada.ide.sdk_1.2.0.qualifier.jar" id="org.openscada.ide.sdk" version="1.2.0.qualifier">
+      <category name="org.openscada.sdk.category"/>
+   </feature>
    <category-def name="org.openscada.category" label="openSCADA">
       <description>
          All binaries.

File org.openscada-p2/pom.xml

View file
  • Ignore whitespace
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>p2</artifactId>
+	<groupId>org.openscada.p2</groupId>
+	<artifactId>org.openscada</artifactId>
+	
 	<packaging>eclipse-repository</packaging>
 </project>

File superParent/pom.xml

View file
  • Ignore whitespace
 	</distributionManagement>
 
 	<properties>
-		<eclipse.scada.release>0.1</eclipse.scada.release>
+		<openscada.release>1.2</openscada.release>
+		<openscada.releaseType>nightly</openscada.releaseType>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

File superParent/targetPlatform/targetPlatform.target

View file
  • Ignore whitespace
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="openSCADA Target Platform (Development)" sequenceNumber="1403706758">
+<target name="openSCADA Target Platform (Development)" sequenceNumber="1403798681">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="3.9.0.v20140221-1852"/>
       <unit id="org.eclipse.scada.protocols.sdk.feature.group" version="0.1.0.v20140520-1210"/>
       <unit id="org.eclipse.scada.base.sdk.feature.group" version="0.1.0.v20140520-1210"/>
       <unit id="org.eclipse.scada.core.sdk.feature.group" version="0.1.2.v20140520-1210"/>
+      <unit id="org.eclipse.scada.chart.sdk.feature.group" version="0.1.0.v20140520-1210"/>
+      <unit id="org.eclipse.scada.hmi.sdk.feature.group" version="0.1.0.v20140520-1210"/>
+      <unit id="org.eclipse.scada.configuration.sdk.feature.group" version="0.1.2.v20140520-1210"/>
       <repository location="http://download.eclipse.org/eclipsescada/updates/release/0.1.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="osgi.enterprise" version="4.2.0.v201108120515"/>
       <unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
       <unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
+      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
     </location>
   </locations>

File superParent/targetPlatform/targetPlatform.tpd

View file
  • Ignore whitespace
 	org.eclipse.scada.protocols.sdk.feature.group
 	org.eclipse.scada.base.sdk.feature.group
 	org.eclipse.scada.core.sdk.feature.group
+	org.eclipse.scada.chart.sdk.feature.group
+	org.eclipse.scada.hmi.sdk.feature.group
+	org.eclipse.scada.configuration.sdk.feature.group
 }
 
 location "http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/" {
 	osgi.enterprise;version=[4.2.0,5.0.0)
 	org.apache.commons.beanutils
 	org.apache.commons.collections
+	com.google.gson
+	com.jcraft.jzlib
 }