You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/13 18:45:01 UTC
archiva git commit: Updating config for new site plugin
Repository: archiva
Updated Branches:
refs/heads/master 79d2e2fd1 -> 7c4e951f8
Updating config for new site plugin
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/7c4e951f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/7c4e951f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/7c4e951f
Branch: refs/heads/master
Commit: 7c4e951f8dc566bcdeed736a133818d653d4324a
Parents: 79d2e2f
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Jun 13 20:44:32 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Jun 13 20:44:32 2017 +0200
----------------------------------------------------------------------
archiva-docs/pom.xml | 28 ----------------------------
archiva-docs/src/site/site.xml | 3 ++-
archiva-modules/pom.xml | 30 +++---------------------------
3 files changed, 5 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c4e951f/archiva-docs/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index c385c0b..59d935b 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -159,32 +159,4 @@
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>offline</id>
- <activation>
- <property>
- <name>offline</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c4e951f/archiva-docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index e0d532c..bc3310d 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -144,12 +144,13 @@
<item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</menu>
-
<footer>
+ <![CDATA[
<div class="row span12">Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.</div>
<div class="row span12">
<a href="${project.url}privacy-policy.html">Privacy Policy</a>
</div>
+ ]]>
</footer>
</body>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c4e951f/archiva-modules/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index ad65c36..ccbc059 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -98,9 +98,11 @@
<inherited>false</inherited>
<configuration>
<notimestamp>true</notimestamp>
- <source>1.7</source>
+ <javadocVersion>1.8</javadocVersion>
+ <source>1.8</source>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://docs.oracle.com/javase/8/docs/api</link>
<link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
<link>http://commons.apache.org/dbcp/apidocs/</link>
<link>http://commons.apache.org/fileupload/apidocs/</link>
@@ -114,32 +116,6 @@
</links>
<linksource>true</linksource>
<show>private</show>
- <!--docletArtifact>
- <groupId>com.google.doclava</groupId>
- <artifactId>doclava</artifactId>
- <version>1.0.5</version>
- </docletArtifact>
- <doclet>com.google.doclava.Doclava</doclet>
- <bootclasspath>${sun.boot.class.path}</bootclasspath>
- <additionalparam>
-
- -hdf project.name "${project.name}"
- -d ${project.build.directory}/site/apidocs
- </additionalparam>
- <useStandardDocletOptions>false</useStandardDocletOptions>
- <additionalJOption>-J-Xmx1024m</additionalJOption>
- <additionnalDependencies>
- <additionnalDependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </additionnalDependency>
- <additionnalDependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.6</version>
- </additionnalDependency>
- </additionnalDependencies-->
<tags>
<tag>
<name>todo</name>