Skip to content

Commit

Permalink
issue #1 "%n" string when the plugin is inserted
Browse files Browse the repository at this point in the history
issue #2 dependencies.jar contains hidden __MACOSX folder
  • Loading branch information
Christian Fröhler authored and Christian Fröhler committed Mar 29, 2016
1 parent 448ce28 commit feda420
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 3 deletions.
21 changes: 19 additions & 2 deletions WorksheetPlugin/pom.xml
Expand Up @@ -19,7 +19,7 @@
<groupId>de.teststory.jspwiki</groupId>
<artifactId>WorksheetPlugin</artifactId>
<packaging>jar</packaging>
<version>0.4-SNAPSHOT</version>
<version>0.5</version>
<name>WorksheetPlugin</name>
<url>http://maven.apache.org</url>
<properties>
Expand Down Expand Up @@ -84,7 +84,24 @@
<target>1.6</target>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<descriptor>src/assembly/dep.xml</descriptor>
<finalName>WorksheetPlugin-required-libs-${version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>create-archive</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
34 changes: 34 additions & 0 deletions WorksheetPlugin/src/assembly/dep.xml
@@ -0,0 +1,34 @@
<!--
Copyright 2016 Christian Froehler
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/required_libs</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>junit*</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>
Expand Up @@ -91,7 +91,7 @@ public String execute(WikiContext context, Map params) throws PluginException {
ToHtml toHtml = ToHtml.create(wb, sb);
sb.append("<style type=\"text/css\">");
toHtml.printStyles();
sb.append("</style>%n");
sb.append("</style>");
toHtml.printSheet(sheet);
return sb.toString();

Expand Down

0 comments on commit feda420

Please sign in to comment.