You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/11 14:58:10 UTC
cayenne-website git commit: Cleanup dev guides
Repository: cayenne-website
Updated Branches:
refs/heads/master 8389e47b1 -> fa190e37e
Cleanup dev guides
Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/fa190e37
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/fa190e37
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/fa190e37
Branch: refs/heads/master
Commit: fa190e37e68bfb2fdb2790215ae64c71556b977e
Parents: 8389e47
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jan 11 17:58:06 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jan 11 17:58:06 2018 +0300
----------------------------------------------------------------------
src/main/site/content/dev/building-cayenne.md | 9 +++----
src/main/site/content/dev/release-guide.md | 19 ++++++--------
src/main/site/content/dev/running-unit-tests.md | 26 ++++++++++----------
3 files changed, 23 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/fa190e37/src/main/site/content/dev/building-cayenne.md
----------------------------------------------------------------------
diff --git a/src/main/site/content/dev/building-cayenne.md b/src/main/site/content/dev/building-cayenne.md
index 6be62b4..f8ebd4d 100644
--- a/src/main/site/content/dev/building-cayenne.md
+++ b/src/main/site/content/dev/building-cayenne.md
@@ -9,9 +9,7 @@ url: /dev/building-cayenne.html
* Make sure [Maven](http://maven.apache.org/) is installed.
* [Get the source code](/dev/code-repository.html).
-
-<div class="pb-3"><!-- gap 3rem --></div>
-
+{{% gap %}}
## Recommended Maven Settings
@@ -21,9 +19,7 @@ but these should probably work for everyone:
MAVEN_OPTS="-Djava.net.preferIPv4Stack=true -Xms512m"
-
-<div class="pb-3"><!-- gap 3rem --></div>
-
+{{% gap %}}
## Building with Maven
@@ -62,4 +58,5 @@ Mac OS X assembly:
mvn clean install -Passembly,mac
Multiple assemblies built at once:
+
mvn clean install -Passembly,src,generic,mac
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/fa190e37/src/main/site/content/dev/release-guide.md
----------------------------------------------------------------------
diff --git a/src/main/site/content/dev/release-guide.md b/src/main/site/content/dev/release-guide.md
index 8e5d41f..177e485 100644
--- a/src/main/site/content/dev/release-guide.md
+++ b/src/main/site/content/dev/release-guide.md
@@ -150,26 +150,21 @@ select the staging repo and click "Release".
that the release has been released. Ensure there is another milestone or
release target already created for further work, but this was probably
already done when a branch was created in preparation for release.
-* Update the [DOAP file](http://svn.apache.org/repos/asf/cayenne/site/cms/trunk/content/doap/cayenne.rdf)
- which will update
-https://projects.apache.org/project.html?cayenne automatically.
* If the release is significant, consider press releases to relevant news
sources
* Review the main website pages (front page and why-cayenne especially) to
add any new features
-* Add a news item to the Cayenne web site
+* Add new cayenne version and a news item to the Cayenne web site (see [CMS Guide]({{< ref "cms-guide.md#content-modifications" >}}))
* Send an email to the Cayenne user and developer lists
-* Send a notification email to announceATapache.org
-* Update [http://en.wikipedia.org/wiki/Apache_Cayenne](http://en.wikipedia.org/wiki/Apache_Cayenne)
+* Send a notification email to announce(at)apache.org
+* Update http://en.wikipedia.org/wiki/Apache_Cayenne
{{% gap %}}
## Reference:
-* Apache release publishing:
-[http://www.apache.org/dev/release-publishing.html](http://www.apache.org/dev/release-publishing.html)
-* Apache Maven release publishing:
-[http://www.apache.org/dev/publishing-maven-artifacts.html](http://www.apache.org/dev/publishing-maven-artifacts.html)
-* ARAT: [http://code.google.com/p/arat/](http://code.google.com/p/arat/)
-* Signing Releases: [http://www.apache.org/dev/release-signing.html](http://www.apache.org/dev/release-signing.html)
+* Apache release publishing: http://www.apache.org/dev/release-publishing.html
+* Apache Maven release publishing: http://www.apache.org/dev/publishing-maven-artifacts.html
+* Apache RAT: https://creadur.apache.org/rat/
+* Signing Releases: http://www.apache.org/dev/release-signing.html
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/fa190e37/src/main/site/content/dev/running-unit-tests.md
----------------------------------------------------------------------
diff --git a/src/main/site/content/dev/running-unit-tests.md b/src/main/site/content/dev/running-unit-tests.md
index 18b879f..d11a1c9 100644
--- a/src/main/site/content/dev/running-unit-tests.md
+++ b/src/main/site/content/dev/running-unit-tests.md
@@ -5,8 +5,7 @@ url: /dev/running-unit-tests.html
---
Cayenne provides a comprehensive suite of unit tests. To execute unit tests
-you must first get Cayenne from Git, install JDK 1.7 and obtain the latest
-Maven.
+you must first get Cayenne from Git, install JDK 1.8 and obtain the latest Maven.
## Prerequisites
@@ -90,11 +89,6 @@ the POM or the examples below.
$ mvn install:install-file -Dfile=ojdbc5.jar -DgroupId=com.oracle \
-DartifactId=oracle-driver -Dversion=11 -Dpackaging=jar -DgeneratePom=true
-**SQLServer:**
-
- $ mvn install:install-file -Dfile=sqljdbc4.jar -DgroupId=com.microsoft \
- -DartifactId=sqlserver-driver -Dversion=4.0 -Dpackaging=jar -DgeneratePom=true
-
**Sybase:**
$ mvn install:install-file -Dfile=jconn3.jar -DgroupId=com.sybase \
@@ -143,18 +137,24 @@ similar to this example:
mysql.jdbc.url = jdbc:mysql://mysql.host:3306/test_db?useUnicode=true&characterEncoding=UTF-8&generateSimpleParameterMetadata=true
mysql.jdbc.driver = com.mysql.jdbc.Driver
- oracle.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
- oracle.jdbc.username = someuser
- oracle.jdbc.password = somepasswd
- oracle.jdbc.url = jdbc:oracle:thin:@//oracle.host:1521/XE
- oracle.jdbc.driver = oracle.jdbc.driver.OracleDriver
-
postgres.adapter = org.apache.cayenne.dba.postgres.PostgresAdapter
postgres.jdbc.username = someuser
postgres.jdbc.password = somepasswd
postgres.jdbc.url = jdbc:postgresql://postgresql.host:5432/test_db
postgres.jdbc.driver = org.postgresql.Driver
+ oracle.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
+ oracle.jdbc.username = someuser
+ oracle.jdbc.password = somepasswd
+ oracle.jdbc.url = jdbc:oracle:thin:@//oracle.host:1521/XE
+ oracle.jdbc.driver = oracle.jdbc.driver.OracleDriver
+
+ sqlserver.adapter = org.apache.cayenne.dba.sqlserver.SQLServerAdapter
+ sqlserver.jdbc.url = jdbc:sqlserver://sqlserver.host:1433;databaseName=test_db
+ sqlserver.jdbc.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
+ sqlserver.jdbc.username = someuser
+ sqlserver.jdbc.password = somepasswd
+
db2.adapter = org.apache.cayenne.dba.db2.DB2Adapter
db2.jdbc.username = someuser
db2.jdbc.password = somepasswd