Skip to content

Commit feda420

Browse files
Christian FröhlerChristian Fröhler
authored andcommitted
issue #1 "%n" string when the plugin is inserted
issue #2 dependencies.jar contains hidden __MACOSX folder
1 parent 448ce28 commit feda420

3 files changed

Lines changed: 54 additions & 3 deletions

File tree

WorksheetPlugin/pom.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>de.teststory.jspwiki</groupId>
2020
<artifactId>WorksheetPlugin</artifactId>
2121
<packaging>jar</packaging>
22-
<version>0.4-SNAPSHOT</version>
22+
<version>0.5</version>
2323
<name>WorksheetPlugin</name>
2424
<url>http://maven.apache.org</url>
2525
<properties>
@@ -84,7 +84,24 @@
8484
<target>1.6</target>
8585
</configuration>
8686
</plugin>
87-
87+
<plugin>
88+
<artifactId>maven-assembly-plugin</artifactId>
89+
<version>2.5.3</version>
90+
<configuration>
91+
<descriptor>src/assembly/dep.xml</descriptor>
92+
<finalName>WorksheetPlugin-required-libs-${version}</finalName>
93+
<appendAssemblyId>false</appendAssemblyId>
94+
</configuration>
95+
<executions>
96+
<execution>
97+
<id>create-archive</id>
98+
<phase>package</phase>
99+
<goals>
100+
<goal>single</goal>
101+
</goals>
102+
</execution>
103+
</executions>
104+
</plugin>
88105
</plugins>
89106
</build>
90107
</project>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!--
2+
Copyright 2016 Christian Froehler
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<assembly
17+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
20+
<id>bin</id>
21+
<formats>
22+
<format>zip</format>
23+
</formats>
24+
<includeBaseDirectory>false</includeBaseDirectory>
25+
<fileSets>
26+
<fileSet>
27+
<directory>${project.build.directory}/required_libs</directory>
28+
<outputDirectory>/</outputDirectory>
29+
<excludes>
30+
<exclude>junit*</exclude>
31+
</excludes>
32+
</fileSet>
33+
</fileSets>
34+
</assembly>

WorksheetPlugin/src/main/java/de/teststory/jspwiki/worksheetplugin/WorksheetPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public String execute(WikiContext context, Map params) throws PluginException {
9191
ToHtml toHtml = ToHtml.create(wb, sb);
9292
sb.append("<style type=\"text/css\">");
9393
toHtml.printStyles();
94-
sb.append("</style>%n");
94+
sb.append("</style>");
9595
toHtml.printSheet(sheet);
9696
return sb.toString();
9797

0 commit comments

Comments
 (0)