Changeset 5442
- Timestamp:
- 05/08/10 14:35:01 (3 years ago)
- Location:
- FCKeditor.Java/trunk
- Files:
-
- 3 edited
-
java-core/pom.xml (modified) (6 diffs)
-
java-demo/pom.xml (modified) (3 diffs)
-
pom.xml (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
FCKeditor.Java/trunk/java-core/pom.xml
r5440 r5442 21 21 * @version: $Id$ 22 22 --> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 24 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 24 25 <modelVersion>4.0.0</modelVersion> 25 26 <artifactId>java-core</artifactId> … … 97 98 <execution> 98 99 <id>rewrite-tagreference-links</id> 99 <phase> site</phase>100 <phase>post-site</phase> 100 101 <goals> 101 102 <goal>run</goal> … … 113 114 </executions> 114 115 </plugin> 115 <plugin>116 <artifactId>maven-javadoc-plugin</artifactId>117 <executions>118 <execution>119 <id>attach-javadocs</id>120 <goals>121 <goal>jar</goal>122 </goals>123 </execution>124 </executions>125 <configuration>126 <links>127 <link>http://tomcat.apache.org/tomcat-5.5-doc/servletapi/</link>128 <link>http://tomcat.apache.org/tomcat-5.5-doc/jspapi/</link>129 </links>130 </configuration>131 </plugin>132 <plugin>133 <artifactId>maven-source-plugin</artifactId>134 <executions>135 <execution>136 <id>attach-sources</id>137 <goals>138 <goal>jar-no-fork</goal>139 </goals>140 </execution>141 </executions>142 </plugin>143 116 </plugins> 144 117 </build> … … 185 158 </plugin>--> 186 159 <plugin> 187 <artifactId> 188 maven-project-info-reports-plugin 189 </artifactId> 160 <artifactId>maven-project-info-reports-plugin</artifactId> 190 161 <version>2.1.2</version> 191 162 <reportSets> … … 203 174 <configuration> 204 175 <quiet>true</quiet> 205 <links> 176 <show>package</show> 177 <docfilessubdirs>true</docfilessubdirs> 178 <keywords>true</keywords> 179 <detectOfflineLinks>false</detectOfflineLinks> 180 <links> 206 181 <link>http://tomcat.apache.org/tomcat-5.5-doc/servletapi/</link> 207 182 <link>http://tomcat.apache.org/tomcat-5.5-doc/jspapi/</link> 208 183 </links> 209 <show>package</show>210 <docfilessubdirs>true</docfilessubdirs>211 <keywords>true</keywords>212 184 </configuration> 213 185 <reportSets> … … 224 196 <version>2.2.2</version> 225 197 <configuration> 226 <comparisonVersion>2. 5</comparisonVersion>198 <comparisonVersion>2.6</comparisonVersion> 227 199 <minSeverity>info</minSeverity> 228 200 </configuration> -
FCKeditor.Java/trunk/java-demo/pom.xml
r5439 r5442 21 21 * @version: $Id$ 22 22 --> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 24 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 24 25 <modelVersion>4.0.0</modelVersion> 25 26 <artifactId>java-demo</artifactId> … … 77 78 <addMavenDescriptor>false</addMavenDescriptor> 78 79 <manifest> 79 <addDefaultImplementationEntries> 80 true 81 </addDefaultImplementationEntries> 80 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 82 81 </manifest> 83 82 <manifestEntries> 84 <Implementation-URL> 85 ${project.url} 86 </Implementation-URL> 83 <Implementation-URL>${project.url}</Implementation-URL> 87 84 <Built-By>${project.organization.name}</Built-By> 88 85 </manifestEntries> … … 116 113 <plugins> 117 114 <plugin> 118 <artifactId> 119 maven-project-info-reports-plugin 120 </artifactId> 115 <artifactId>maven-project-info-reports-plugin</artifactId> 121 116 <version>2.1.2</version> 122 117 <reportSets> -
FCKeditor.Java/trunk/pom.xml
r5441 r5442 21 21 * @version: $Id$ 22 22 --> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 23 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 24 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 24 25 <modelVersion>4.0.0</modelVersion> 25 26 <groupId>net.fckeditor</groupId> … … 32 33 </modules> 33 34 <properties> 34 <project.build.sourceEncoding> 35 UTF-8 36 </project.build.sourceEncoding> 37 <project.reporting.outputEncoding> 38 UTF-8 39 </project.reporting.outputEncoding> 35 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 36 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 40 37 <!-- SLF4J version range [1.5.5,1.6) won't work due to http://jira.codehaus.org/browse/MNG-3806 --> 41 38 <slf4jVersion>1.5.8</slf4jVersion> … … 55 52 <version>2.0.1</version> 56 53 </plugin> 57 <plugin>54 <plugin> 58 55 <artifactId>maven-javadoc-plugin</artifactId> 59 56 <version>2.7</version> 60 57 <configuration> 61 <detectOfflineLinks>false</detectOfflineLinks> 62 <archive> 63 <manifest> 64 <addDefaultImplementationEntries> 65 true 66 </addDefaultImplementationEntries> 67 </manifest> 68 <manifestEntries> 69 <Implementation-URL> 70 ${project.url} 71 </Implementation-URL> 72 <Built-By>${project.organization.name}</Built-By> 73 </manifestEntries> 74 </archive> 75 <show>package</show> 76 <docfilessubdirs>true</docfilessubdirs> 77 <keywords>true</keywords> 78 </configuration> 58 <archive> 59 <manifest> 60 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 61 </manifest> 62 <manifestEntries> 63 <Implementation-URL>${project.url}</Implementation-URL> 64 <Built-By>${project.organization.name}</Built-By> 65 </manifestEntries> 66 </archive> 67 <!-- This can be disabled right now because javadoc plugin inherits 68 from reports an we have only one module with javadoc. --> 69 <!-- 70 <quiet>true</quiet> 71 <show>package</show> 72 <docfilessubdirs>true</docfilessubdirs> 73 <keywords>true</keywords> 74 <detectOfflineLinks>false</detectOfflineLinks> 75 --> 76 </configuration> 79 77 </plugin> 80 78 <plugin> … … 82 80 <version>2.1.1</version> 83 81 <configuration> 84 <archive> 85 <manifest> 86 <addDefaultImplementationEntries> 87 true 88 </addDefaultImplementationEntries> 89 </manifest> 90 <manifestEntries> 91 <Implementation-URL> 92 ${project.url} 93 </Implementation-URL> 94 <Built-By>${project.organization.name}</Built-By> 95 </manifestEntries> 96 </archive> 97 <excludes> 98 <exclude>**/package-info.java</exclude> 99 </excludes> 100 <excludeResources>true</excludeResources> 101 </configuration> 82 <archive> 83 <manifest> 84 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 85 </manifest> 86 <manifestEntries> 87 <Implementation-URL>${project.url}</Implementation-URL> 88 <Built-By>${project.organization.name}</Built-By> 89 </manifestEntries> 90 </archive> 91 <excludes> 92 <exclude>**/package-info.java</exclude> 93 </excludes> 94 <excludeResources>true</excludeResources> 95 </configuration> 102 96 </plugin> 103 97 <plugin> … … 134 128 <archive> 135 129 <manifest> 136 <addDefaultImplementationEntries> 137 true 138 </addDefaultImplementationEntries> 130 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 139 131 </manifest> 140 132 <manifestEntries> 141 <Implementation-URL> 142 ${project.url} 143 </Implementation-URL> 133 <Implementation-URL>${project.url}</Implementation-URL> 144 134 <Built-By>${project.organization.name}</Built-By> 145 135 </manifestEntries> … … 151 141 <version>1.3</version> 152 142 <dependencies> 153 <dependency>154 <groupId>ant</groupId>155 <artifactId>ant-nodeps</artifactId>156 <version>1.6.5</version>157 </dependency>158 </dependencies>143 <dependency> 144 <groupId>ant</groupId> 145 <artifactId>ant-nodeps</artifactId> 146 <version>1.6.5</version> 147 </dependency> 148 </dependencies> 159 149 </plugin> 160 150 <plugin> … … 245 235 <plugins> 246 236 <plugin> 247 <artifactId> 248 maven-project-info-reports-plugin 249 </artifactId> 237 <artifactId>maven-project-info-reports-plugin</artifactId> 250 238 <version>2.1.2</version> 251 239 <inherited>false</inherited>
Note: See TracChangeset
for help on using the changeset viewer.
