You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2021/05/12 18:45:44 UTC
[any23] branch master updated: ANY23-371 Any23 cannot start in CMD
in Windows 10 (#170)
This is an automated email from the ASF dual-hosted git repository.
lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
The following commit(s) were added to refs/heads/master by this push:
new 978d2a0 ANY23-371 Any23 cannot start in CMD in Windows 10 (#170)
978d2a0 is described below
commit 978d2a058d6b40956b0861c2068293085d23ba4c
Author: Kai Liu <tj...@gmail.com>
AuthorDate: Wed May 12 20:45:38 2021 +0200
ANY23-371 Any23 cannot start in CMD in Windows 10 (#170)
---
cli/pom.xml | 9 ++++++++-
cli/src/main/assembly/bin.xml | 22 ++++++++++++++++++----
pom.xml | 10 ++++++++++
3 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/cli/pom.xml b/cli/pom.xml
index ac9f166..3d583ac 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -304,6 +304,12 @@
</dependency>
<!-- END: additional dependencies used by RDF4J or Tika -->
+ <dependency>
+ <groupId>org.codehaus.mojo.appassembler</groupId>
+ <artifactId>appassembler-booter</artifactId>
+ <version>1.10</version>
+ </dependency>
+
</dependencies>
<build>
@@ -332,7 +338,8 @@
<execution>
<phase>package</phase>
<goals>
- <goal>assemble</goal>
+ <goal>generate-daemons</goal>
+ <goal>create-repository</goal>
</goals>
</execution>
</executions>
diff --git a/cli/src/main/assembly/bin.xml b/cli/src/main/assembly/bin.xml
index ae52c0d..72115c3 100644
--- a/cli/src/main/assembly/bin.xml
+++ b/cli/src/main/assembly/bin.xml
@@ -61,9 +61,16 @@
| shell scripts
-->
<fileSet>
- <directory>${project.build.directory}/appassembler/bin/</directory>
- <outputDirectory>/bin</outputDirectory>
+ <directory>${project.build.directory}/generated-resources/appassembler/booter-unix/bin/</directory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/appassembler/booter-windows/bin/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
</fileSet>
<!--
@@ -71,7 +78,7 @@
-->
<fileSet>
<directory>${project.build.directory}/appassembler/lib/</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<excludes>
<exclude>*.xml</exclude>
</excludes>
@@ -81,8 +88,15 @@
| Configuration and Resources
-->
<fileSet>
+ <directory>${project.build.directory}/generated-resources/appassembler/booter-unix/etc/</directory>
+ <outputDirectory>etc</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.build.directory}/appassembler/conf/</directory>
- <outputDirectory>/conf</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
</fileSet>
</fileSets>
diff --git a/pom.xml b/pom.xml
index eff30d3..a2955d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -686,6 +686,16 @@
<repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName>
<extraJvmArguments>-Xms500m -Xmx500m -XX:PermSize=128m -XX:-UseGCOverheadLimit</extraJvmArguments>
+ <daemons>
+ <daemon>
+ <id>any23</id>
+ <mainClass>org.apache.any23.cli.ToolRunner</mainClass>
+ <platforms>
+ <platform>booter-unix</platform>
+ <platform>booter-windows</platform>
+ </platforms>
+ </daemon>
+ </daemons>
</configuration>
</plugin>