You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/24 22:41:58 UTC
[1/3] git commit: updated parent pom
Repository: maven-indexer
Updated Branches:
refs/heads/master 5e034f7ee -> d6f8f1dac
updated parent pom
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/0cdd3eb4
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/0cdd3eb4
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/0cdd3eb4
Branch: refs/heads/master
Commit: 0cdd3eb4c711c2c6eeb19b95e8d8dac736a54291
Parents: 5e034f7
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Jun 23 00:04:50 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Jun 23 00:04:50 2014 +0200
----------------------------------------------------------------------
pom.xml | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0cdd3eb4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4743574..5e91b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>23</version>
+ <version>24</version>
</parent>
<groupId>org.apache.maven.indexer</groupId>
@@ -74,6 +74,8 @@ under the License.
<properties>
<surefire.redirectTestOutputToFile>false</surefire.redirectTestOutputToFile>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
<sisu-inject-plexus.version>2.2.3</sisu-inject-plexus.version>
<lucene.version>3.6.2</lucene.version>
@@ -213,6 +215,26 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin><!-- TODO remove when upgrading to maven-parent 25 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ </enforceBytecodeVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
[2/3] git commit: [MNGSITE-152] added standard license and download
links
Posted by hb...@apache.org.
[MNGSITE-152] added standard license and download links
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/64c3e573
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/64c3e573
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/64c3e573
Branch: refs/heads/master
Commit: 64c3e57385b9a04c869caf0eb5c97982750349a5
Parents: 0cdd3eb
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Jun 23 00:09:17 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Jun 23 00:09:17 2014 +0200
----------------------------------------------------------------------
src/site/resources/download.cgi | 22 ++++++
src/site/site.xml | 7 ++
src/site/xdoc/download.xml.vm | 126 +++++++++++++++++++++++++++++++++++
3 files changed, 155 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/64c3e573/src/site/resources/download.cgi
----------------------------------------------------------------------
diff --git a/src/site/resources/download.cgi b/src/site/resources/download.cgi
new file mode 100644
index 0000000..1b178d2
--- /dev/null
+++ b/src/site/resources/download.cgi
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+# Just call the standard mirrors.cgi script. It will use download.html
+# as the input template.
+exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/64c3e573/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9d86f04..2e9817b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -54,6 +54,13 @@ under the License.
<item name="Maven Indexer" href="http://maven.apache.org/maven-indexer/index.html" />
</breadcrumbs>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+ <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="Download" href="download.html"/>
+ </menu>
+
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
</body>
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/64c3e573/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
new file mode 100644
index 0000000..44eb9c4
--- /dev/null
+++ b/src/site/xdoc/download.xml.vm
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+
+<document>
+ <properties>
+ <title>Download ${project.name} Source</title>
+ </properties>
+ <body>
+ <section name="Download ${project.name} ${project.version} Source">
+
+ <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
+ ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
+
+ <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
+ hours to reach all mirrors.<p/>
+
+ <p>In order to guard against corrupted downloads/installations, it is highly recommended to
+ <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
+ of the release bundles against the public <a href="http://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
+ developers.</p>
+
+ <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+
+ <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
+
+ <a name="mirror"/>
+ <subsection name="Mirror">
+
+ <p>
+ [if-any logo]
+ <a href="[link]">
+ <img align="right" src="[logo]" border="0"
+ alt="logo"/>
+ </a>
+ [end]
+ The currently selected mirror is
+ <b>[preferred]</b>.
+ If you encounter a problem with this mirror,
+ please select another mirror.
+ If all mirrors are failing, there are
+ <i>backup</i>
+ mirrors
+ (at the end of the mirrors list) that should be available.
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror">
+ Other mirrors:
+ <select name="Preferred">
+ [if-any http]
+ [for http]
+ <option value="[http]">[http]</option>
+ [end]
+ [end]
+ [if-any ftp]
+ [for ftp]
+ <option value="[ftp]">[ftp]</option>
+ [end]
+ [end]
+ [if-any backup]
+ [for backup]
+ <option value="[backup]">[backup] (backup)</option>
+ [end]
+ [end]
+ </select>
+ <input type="submit" value="Change"/>
+ </form>
+
+ <p>
+ You may also consult the
+ <a href="http://www.apache.org/mirrors/">complete list of
+ mirrors.</a>
+ </p>
+
+ </subsection>
+
+ <subsection name="${project.name} ${project.version}">
+
+ <p>This is the current stable version of ${project.name}.</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Link</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>${project.name} ${project.version} (Source zip)</td>
+ <td><a href="[preferred]maven/indexer/${project.artifactId}-${project.version}-source-release.zip">maven/indexer/${project.artifactId}-${project.version}-source-release.zip</a></td>
+ <td><a href="http://www.apache.org/dist/maven/indexer/${project.artifactId}-${project.version}-source-release.zip.md5">maven/indexer/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/indexer/${project.artifactId}-${project.version}-source-release.zip.asc">maven/indexer/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+
+ <subsection name="Previous Versions">
+
+ <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/indexer/">archive site</a>.</p>
+
+ </subsection>
+ </section>
+ </body>
+</document>
+
[3/3] git commit: fixed deploySite.sh and removed README.TXT: these
are standard instructions
Posted by hb...@apache.org.
fixed deploySite.sh and removed README.TXT: these are standard
instructions
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/d6f8f1da
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/d6f8f1da
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/d6f8f1da
Branch: refs/heads/master
Commit: d6f8f1dacdf277f22c415a02532e701d8698f19c
Parents: 64c3e57
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Jun 23 00:11:51 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Jun 23 00:11:51 2014 +0200
----------------------------------------------------------------------
README.TXT | 30 ------------------------------
deploySite.sh | 3 ++-
2 files changed, 2 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/d6f8f1da/README.TXT
----------------------------------------------------------------------
diff --git a/README.TXT b/README.TXT
deleted file mode 100644
index 32ada03..0000000
--- a/README.TXT
+++ /dev/null
@@ -1,30 +0,0 @@
-Deploying web site
-------------------
-You can use the deploySite.sh script
-Without any profile the site will be deployed to http://maven.apache.org/maven-indexer-archives/maven-indexer-${project.version}
-sh ./deploySite.sh -Preporting
-
-To deploy main version http://maven.apache.org/surefire, use
-sh ./deploySite.sh -Preporting -Psite-release
-
-Note you can add arguments to the script to pass your svn credentials:
--Dusername=
--Dpassword=
-
-Workflow for site when releasing
---------------------------------
-Once release staged, you can publish a staged site.
-cd target/checkout
-sh ./deploySite.sh -Preporting
-content will be in http://maven.apache.org/maven-indexer-archives/maven-indexer-${project.version}
-
-If something goes wrong when publishing the site to svnpubsub (like https://jira.codehaus.org/browse/MSCMPUB-6),
-you can avoid rebuilding the site before publishing with
-mvn -Preporting scm-publish:publish-scm
-
-Once vote passed, redeploy main site:
-cd target/checkout (or use the version tag)
-sh ./deploySite.sh -Preporting -Psite-release
-
-
-
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/d6f8f1da/deploySite.sh
----------------------------------------------------------------------
diff --git a/deploySite.sh b/deploySite.sh
index b6517a2..f6c265d 100644
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -19,4 +19,5 @@
# under the License.
#
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn -Preporting site site:stage $@
+mvn scm-publish:publish-scm $@