summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/impl-parent/pom.xml2
-rw-r--r--common/minimal-assembly-descriptor/src/main/resources/assemblies/honeycomb-minimal.xml4
-rw-r--r--common/minimal-distribution-parent/pom.xml (renamed from common/minimal-distro-parent/pom.xml)7
-rw-r--r--common/pom.xml2
4 files changed, 10 insertions, 5 deletions
diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index f09996564..4cce01f8b 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -32,6 +32,8 @@
<properties>
<checkstyle.header.file>APACHE_HEADER.txt</checkstyle.header.file>
<nexusproxy>http://nexus.fd.io/content</nexusproxy>
+ <guice.version>4.1.0</guice.version>
+ <guice.config.version>1.2.0</guice.config.version>
</properties>
<build>
diff --git a/common/minimal-assembly-descriptor/src/main/resources/assemblies/honeycomb-minimal.xml b/common/minimal-assembly-descriptor/src/main/resources/assemblies/honeycomb-minimal.xml
index 03f403b21..7f9111706 100644
--- a/common/minimal-assembly-descriptor/src/main/resources/assemblies/honeycomb-minimal.xml
+++ b/common/minimal-assembly-descriptor/src/main/resources/assemblies/honeycomb-minimal.xml
@@ -21,6 +21,7 @@
<formats>
<format>tar.gz</format>
<format>zip</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
@@ -33,9 +34,6 @@
<fileSet>
<directory>${project.build.directory}/lib</directory>
<outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
</fileSet>
<fileSet>
<directory>${project.build.outputDirectory}/honeycomb-minimal-resources</directory>
diff --git a/common/minimal-distro-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
index 0994b667a..ac67b7921 100644
--- a/common/minimal-distro-parent/pom.xml
+++ b/common/minimal-distribution-parent/pom.xml
@@ -83,6 +83,8 @@
<mainClass>${main.class}</mainClass>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
+ <useUniqueVersions>false</useUniqueVersions>
+ <classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
</manifest>
<manifestEntries>
<Class-Path>config/</Class-Path>
@@ -105,6 +107,8 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <useBaseVersion>true</useBaseVersion>
+ <useRepositoryLayout>true</useRepositoryLayout>
</configuration>
</execution>
<execution>
@@ -133,13 +137,14 @@
<goal>execute</goal>
</goals>
<configuration>
+ <!-- TODO add remote debug option -->
<source>
import java.nio.file.Paths
log.info "Generating shell exec script"
def args = properties.getOrDefault("exec.parameters", "")
log.debug "Additional shell exec script properties: ${args}"
- def scriptContent = "java ${args} -jar ${project.artifactId}-${project.version}.jar"
+ def scriptContent = "java ${args} -jar \$(dirname \$0)/${project.artifactId}-${project.version}.jar"
log.info "Generating shell exec script as ${scriptContent}"
def scriptParent = Paths.get(project.build.outputDirectory, "honeycomb-minimal-resources")
scriptParent.toFile().mkdirs()
diff --git a/common/pom.xml b/common/pom.xml
index 64f85af11..12f87b9ce 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,7 +31,7 @@
<module>impl-parent</module>
<module>karaf-parent</module>
<module>minimal-assembly-descriptor</module>
- <module>minimal-distro-parent</module>
+ <module>minimal-distribution-parent</module>
</modules>
<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->