Tidy up distribution packaging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/986d2dcf Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/986d2dcf Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/986d2dcf Branch: refs/heads/hadoop-rdf Commit: 986d2dcf9b992d668dca1a581d918b555f731cb5 Parents: 4e6da04 Author: Andy Seaborne <[email protected]> Authored: Mon Jan 5 20:45:04 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Mon Jan 5 20:45:04 2015 +0000 ---------------------------------------------------------------------- jena-fuseki2/jena-fuseki-dist/fuseki-server | 3 ++- jena-fuseki2/jena-fuseki-dist/pom.xml | 1 + jena-fuseki2/jena-fuseki-server/pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-dist/fuseki-server ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-dist/fuseki-server b/jena-fuseki2/jena-fuseki-dist/fuseki-server index 679b3bd..6ed1ece 100755 --- a/jena-fuseki2/jena-fuseki-dist/fuseki-server +++ b/jena-fuseki2/jena-fuseki-dist/fuseki-server @@ -26,13 +26,14 @@ then fi JAR1="$FUSEKI_HOME/fuseki-server.jar" -JAR2="$FUSEKI_HOME/jena-fuseki-*-server.jar" +JAR2="$FUSEKI_HOME/jena-fuseki-server-*.jar" JAR="" for J in "$JAR1" "$JAR2" do # Expand J="$(echo $J)" + echo $J if [ -e "$J" ] then JAR="$J" http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-dist/pom.xml ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-dist/pom.xml b/jena-fuseki2/jena-fuseki-dist/pom.xml index 6da0ca9..c72f1ed 100644 --- a/jena-fuseki2/jena-fuseki-dist/pom.xml +++ b/jena-fuseki2/jena-fuseki-dist/pom.xml @@ -79,6 +79,7 @@ <!--<phase/>--> <goals><goal>single</goal></goals> <configuration> + <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>assembly-dist.xml</descriptor> </descriptors> http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-server/pom.xml ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml index b809285..7ee5d2b 100644 --- a/jena-fuseki2/jena-fuseki-server/pom.xml +++ b/jena-fuseki2/jena-fuseki-server/pom.xml @@ -87,7 +87,7 @@ --> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass> + <mainClass>org.apache.jena.fuseki.cmd.FusekiCmd</mainClass> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
