This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-json.git
The following commit(s) were added to refs/heads/master by this push:
new 29a4a0f fix git related site:stage generation urls, add git asf.yaml,
and .gitignore, include jackson1 /may remove it later)
29a4a0f is described below
commit 29a4a0f56fd9d8e18f31d7db454db3e6479a08c9
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Sep 20 17:34:33 2021 +0200
fix git related site:stage generation urls, add git asf.yaml, and
.gitignore, include jackson1 /may remove it later)
---
.asf.yaml | 21 +++++++++++++++
.gitignore | 14 ++++++++++
api/pom.xml | 8 +++---
api/src/site/site.xml | 2 +-
dist/pom.xml | 4 +++
gson/pom.xml | 6 ++---
jackson/pom.xml | 9 +++----
jackson2/pom.xml | 5 ++--
pom.xml | 70 ++++++++++++++++++++++++++++++++++++++++---------
src/changes/changes.xml | 4 ++-
10 files changed, 112 insertions(+), 31 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..0e8eaea
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+github:
+ features:
+ # Enable issue management
+ issues: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..64cdaa6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+target/
+*.log
+
+.classpath
+.project
+.settings/
+
+# Idea IntelliJ
+*.ipr
+*.iws
+*.iml
+.idea/
+
+pom.xml.*
\ No newline at end of file
diff --git a/api/pom.xml b/api/pom.xml
index 268e69d..9843fcd 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -27,12 +27,10 @@
<name>Fulcrum JSON API</name>
<description>Fulcrum JSON Basic API</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url>
-
+ <url>https://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url>
+
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</developerConnection>
- <url>https://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/</url>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/api</url>
</scm>
<dependencies>
diff --git a/api/src/site/site.xml b/api/src/site/site.xml
index ddfb906..64bccdd 100644
--- a/api/src/site/site.xml
+++ b/api/src/site/site.xml
@@ -23,7 +23,7 @@
name="Fulcrum JSON API">
<body>
- <menu ref="reports"></menu>
+ <menu ref="reports" inherit="top"></menu>
</body>
</project>
diff --git a/dist/pom.xml b/dist/pom.xml
index 09dd98b..94af1b7 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -30,6 +30,10 @@
<name>Fulcrum JSON Jar Distribution</name>
+ <scm>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/dist</url>
+ </scm>
+
<!-- NOTE: These dependency declarations are only required to sort this
project to the
end of the line in the multimodule build ensuring that this
distribution project builds AFTER them ...
diff --git a/gson/pom.xml b/gson/pom.xml
index 3304c5b..f3aac47 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -27,12 +27,12 @@
<name>Fulcrum JSON GSON Impl</name>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-gson</url>
+
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</developerConnection>
- <url>https://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/</url>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/gson</url>
</scm>
+
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 8543840..817b632 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -19,18 +19,17 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fulcrum-json-jackson</artifactId>
<name>Fulcrum JSON Jackson Impl</name>
-
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url>
+
<url>https://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url>
+
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</developerConnection>
-
<url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/</url>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/jackson</url>
</scm>
<build>
diff --git a/jackson2/pom.xml b/jackson2/pom.xml
index 22e391b..849c83e 100644
--- a/jackson2/pom.xml
+++ b/jackson2/pom.xml
@@ -27,10 +27,9 @@
<name>Fulcrum JSON Jackson 2.x Impl</name>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson2</url>
+
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</developerConnection>
- <url>https://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/</url>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/jackson2</url>
</scm>
<build>
diff --git a/pom.xml b/pom.xml
index 51df246..ec2254f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,15 +34,16 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-json.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-json.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf/turbine-fulcrum-json.git</url>
+
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
+ <tag>master</tag><!-- or HEAD -->
</scm>
- <!-- Required for staging to work -->
+ <!-- distributionManagement id and url defined in parent, adapt
turbine.site.path -->
<distributionManagement>
<site>
- <id>turbine.apache.org</id>
<name>Fulcrum JSON Website</name>
- <url>https://turbine.apache.org/fulcrum/fulcrum-json/</url>
+ <id>apache.org</id>
+ <url>https://github.com/apache/turbine-fulcrum-json/</url>
</site>
</distributionManagement>
@@ -82,16 +83,59 @@
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${siteContent.path}</content>
- <tryUpdate>false</tryUpdate>
- </configuration>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${siteContent.path}</content>
+ <tryUpdate>false</tryUpdate>
+ <scmBranch>asf-site</scmBranch>
+ </configuration>
+ </plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <!-- to generate only in root -->
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>default</id>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <skipModules>dist</skipModules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
<dependencies>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -128,7 +172,7 @@
</dependencies>
<properties>
- <turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
+ <turbine.site.path>turbine-fulcrum-json</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
</properties>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 94f2706..0f0f39e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,9 @@
</properties>
<body>
- <release version="2.0.1" date="in SVN">
+ <release version="2.0.1" date="in VC">
+ </release>
+ <release version="2.0.1" date="2021-06-29">
<action type="update" dev="gk">
Update Jackson to v2.12.3, GSON to 2.8.7, commons-lang3 to 3.12.0,
json-path to 2.6.0, slf4j-noop to 1.7.30
</action>
