Author: gk
Date: Thu Mar 27 16:34:31 2014
New Revision: 1582386
URL: http://svn.apache.org/r1582386
Log:
fix README, simplify assembly descriptor, remove not supported configuration in
pom.xml
Modified:
turbine/fulcrum/trunk/json/README
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/assembly/project.xml
Modified: turbine/fulcrum/trunk/json/README
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/README?rev=1582386&r1=1582385&r2=1582386&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/README (original)
+++ turbine/fulcrum/trunk/json/README Thu Mar 27 16:34:31 2014
@@ -35,13 +35,13 @@ Top level directories
dist/target/ contains the zipped binary jars *
gson, jackson, jackson2 / contains the different JSON implementation
project files
-src/ contains the interface project files
+api/ contains the interface project files
+src / contains project building files
xdoc / contains the documentation
target/ contains the packaged project files, which
allow to build the project **
* after running mvn install
** after running mvn clean site install -P apache-release, see below
-
--------------------------------------------------------------------------
Component Development
@@ -61,7 +61,7 @@ More Information
Steps
1) Local Testing
- // Verify gpg.homedir, gpg.useagent
+ // Verify gpg.homedir, gpg.useagent, gpg.passphrase
mvn clean site install -Papache-release -Dgpg.useagent=false
-Dgpg.passphrase=<xx>
mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Papache-release
@@ -78,7 +78,7 @@ More Information
http://www.sonatype.com/books/nexus-book/reference/staging.html
5) Close the staging
- Login to and close
+ Login and close
https://repository.apache.org/index.html#stagingRepositories
More Information
@@ -96,4 +96,12 @@ More Information
https://docs.sonatype.org/display/Repository/Dropping+a+Staging+Repository
- Reverse merge the release prepare, manually delete tag in svn repo and
drop staged repository in nexus and start again with step 1.
-
\ No newline at end of file
+--------------------------------------------------------------------------
+Licence
+--------------------------------------------------------------------------
+
+This software is licensed under the Apache 2 license, quoted below.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this project 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.
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1582386&r1=1582385&r2=1582386&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Thu Mar 27 16:34:31 2014
@@ -112,7 +112,6 @@
<goal>single</goal>
</goals>
<configuration>
- <goals>site:site</goals>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<descriptors>
<descriptor>src/assembly/project.xml</descriptor>
Modified: turbine/fulcrum/trunk/json/src/assembly/project.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/assembly/project.xml?rev=1582386&r1=1582385&r2=1582386&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/assembly/project.xml (original)
+++ turbine/fulcrum/trunk/json/src/assembly/project.xml Thu Mar 27 16:34:31 2014
@@ -28,14 +28,6 @@
<!--includeSiteDirectory>true</includeSiteDirectory-->
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
- <includes>
- <include>README*</include>
- <include>pom.xml</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
<includes>
@@ -53,53 +45,15 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/api</directory>
+ <directory>${project.basedir}</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/gson</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
+ <include>README*</include>
+ <include>pom.xml</include>
+ <include>%regex[(api|gson|jackson|jackson2|dist)/.*]</include>
</includes>
<excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/jackson</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/jackson2</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/dist</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
+ <exclude>%regex[.*/target.*]</exclude>
</excludes>
</fileSet>
<fileSet>
