summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-10-23 23:54:08 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2012-10-24 00:03:55 +0200
commit38953ce4c767428270ae41ad968b774b5c145dc3 (patch)
treed36091e627327cd01cb59ada306b66b84b1395a5
parent7594665262f35f73315104d6ac40ee2256da4755 (diff)
downloadapp.sh-apps-jenkins-38953ce4c767428270ae41ad968b774b5c145dc3.tar.gz
app.sh-apps-jenkins-38953ce4c767428270ae41ad968b774b5c145dc3.tar.bz2
app.sh-apps-jenkins-38953ce4c767428270ae41ad968b774b5c145dc3.tar.xz
app.sh-apps-jenkins-38953ce4c767428270ae41ad968b774b5c145dc3.zip
o Preparing for deployment to central.
-rw-r--r--.gitignore2
-rw-r--r--pom.xml49
-rw-r--r--src/main/unix/files/root/etc/app.conf6
3 files changed, 20 insertions, 37 deletions
diff --git a/.gitignore b/.gitignore
index a750dc8..7cc2f5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ target
.idea
.project
.classpath
+*.releaseBackup
+release.properties
diff --git a/pom.xml b/pom.xml
index 2a40ed6..daf17cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,14 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trygvis.appsh</groupId>
- <artifactId>appsh-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
</parent>
- <groupId>io.trygvis.appsh.examples</groupId>
+ <groupId>io.trygvis.appsh.apps</groupId>
<artifactId>jenkins</artifactId>
+ <version>1.486+1-SNAPSHOT</version>
<packaging>unix-zip</packaging>
<dependencies>
<dependency>
@@ -24,29 +26,6 @@
</repositories>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <programs>
- <program>
- <name>jenkins</name>
- <mainClass></mainClass>
- </program>
- </programs>
- </configuration>
- </plugin>
- -->
<plugin>
<groupId>no.arktekk.unix</groupId>
<artifactId>unix-maven-plugin</artifactId>
@@ -55,15 +34,6 @@
<configuration>
<contact>Trygve Laugstol</contact>
<assembly>
- <!--
- <copyDirectory>
- <from>target/appassembler</from>
- <to>root</to>
- <excludes>
- <exclude>**/*.bat</exclude>
- </excludes>
- </copyDirectory>
- -->
<copyArtifact>
<artifact>org.jenkins-ci.main:jenkins-war:war</artifact>
<toFile>root/wars/jenkins.war</toFile>
@@ -73,4 +43,9 @@
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:git:http://trygvis.io/~trygvis/git/2012/10/app.sh-apps-jenkins.git</connection>
+ <developerConnection>scm:git:ssh://trygvis.io/~trygvis/git/2012/10/app.sh-apps-jenkins.git</developerConnection>
+ <url>http://trygvis.io/~trygvis/git/2012/10/app.sh-apps-jenkins.git</url>
+ </scm>
</project>
diff --git a/src/main/unix/files/root/etc/app.conf b/src/main/unix/files/root/etc/app.conf
index 9dfa29b..0212a32 100644
--- a/src/main/unix/files/root/etc/app.conf
+++ b/src/main/unix/files/root/etc/app.conf
@@ -1 +1,7 @@
app.bin=bin/jenkins
+
+# Properties named jenkins.* are passed to the JVM. Run
+#
+# java -jar jenkins/default/current/wars/jenkins.war --help
+#
+# to see the full list of available options.