You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/11/03 01:46:42 UTC
[1/3] isis git commit: ISIS-1092: move owasp plugin to a profile so
is disabled by default. update docs.
Repository: isis
Updated Branches:
refs/heads/master 9c68494db -> efea4aba6
ISIS-1092: move owasp plugin to a profile so is disabled by default. update docs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e6c59e7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e6c59e7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e6c59e7c
Branch: refs/heads/master
Commit: e6c59e7c78dc415bb65e786e9fe15ac59dc416c3
Parents: 9c68494
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 3 00:38:19 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 3 00:38:19 2015 +0000
----------------------------------------------------------------------
.../main/asciidoc/guides/_cg_building-isis.adoc | 6 +--
core/pom.xml | 41 +++++++++++---------
2 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e6c59e7c/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
index 689e7ac..a3f9d39 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
@@ -186,11 +186,10 @@ To check, run:
[source,bash]
----
-cd core
-mvn org.owasp:dependency-check-maven:aggregate
+mvn org.owasp:dependency-check-maven:aggregate -Dowasp
----
-This will generate a single report under `core/target/dependency-check-report.html`.
+This will generate a single report under `target/dependency-check-report.html`.
[NOTE]
@@ -198,3 +197,4 @@ This will generate a single report under `core/target/dependency-check-report.ht
The first time this runs can take 10~20 minutes to download the NVD data feeds.
====
+To disable, either run in offline mode (add `-o` or `--offline`) or omit the `owasp` property.
http://git-wip-us.apache.org/repos/asf/isis/blob/e6c59e7c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 089843b..1890c4c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1021,24 +1021,6 @@ ${license.additional-notes}
</configuration>
</plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <id>owasp-aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <configuration>
- <skipProvidedScope>true</skipProvidedScope>
- <skipRuntimeScope>true</skipRuntimeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -1987,12 +1969,33 @@ ${license.additional-notes}
</build>
</profile>
<profile>
- <id>owasp-check</id>
+ <id>owasp</id>
<activation>
<property>
<name>owasp</name>
</property>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>owasp-aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ <skipProvidedScope>true</skipProvidedScope>
+ <skipRuntimeScope>true</skipRuntimeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
[2/3] isis git commit: ISIS-1231: jdeps maven plugin, and docs.
Posted by da...@apache.org.
ISIS-1231: jdeps maven plugin, and docs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ed74e64c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ed74e64c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ed74e64c
Branch: refs/heads/master
Commit: ed74e64c31daf7df045f5c64fafec82bb0795da9
Parents: e6c59e7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 3 00:40:18 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 3 00:40:18 2015 +0000
----------------------------------------------------------------------
.../main/asciidoc/guides/_cg_building-isis.adoc | 22 +++++++++++++++++
core/pom.xml | 26 ++++++++++++++++++++
2 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ed74e64c/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
index a3f9d39..26024bb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_building-isis.adoc
@@ -198,3 +198,25 @@ The first time this runs can take 10~20 minutes to download the NVD data feeds.
====
To disable, either run in offline mode (add `-o` or `--offline`) or omit the `owasp` property.
+
+
+
+== Checking for use of internal JDK APIs
+
+Apache Isis configures the link:https://maven.apache.org/plugins-archives/maven-jdeps-plugin-3.0.0/[jdeps maven plugin] to check for any usage of internal JDK APIs. This is in preparation for Java 9 module system (Jigsaw) which will prevent such usage of APIs.
+
+To check, run:
+
+[source,bash]
+----
+mvn clean install -Djdeps
+----
+
+This will fail the build on any module that currently uses an internal JDK API.
+
+
+[NOTE]
+====
+At the time of writing the `isis-core-schema` module fails the build.
+====
+
http://git-wip-us.apache.org/repos/asf/isis/blob/ed74e64c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1890c4c..a2e2c24 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1997,6 +1997,32 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdeps</id>
+ <activation>
+ <property>
+ <name>jdeps</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jdeps-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>jdeps-jdkinternals</id>
+ <goals>
+ <goal>jdkinternals</goal>
+ <goal>test-jdkinternals</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<modules>
[3/3] isis git commit: ISIS-1195: updating docs,
refer to online demos.
Posted by da...@apache.org.
ISIS-1195: updating docs, refer to online demos.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/efea4aba
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/efea4aba
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/efea4aba
Branch: refs/heads/master
Commit: efea4aba6f0c2ccdc44be403d92af66f25156641
Parents: ed74e64
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 3 00:45:23 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 3 00:45:23 2015 +0000
----------------------------------------------------------------------
.../src/main/asciidoc/documentation.adoc | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/efea4aba/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index 5bebfcd..ece29a1 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -34,11 +34,9 @@ pass:[<br/>]
|*Learning More*
-// * link:http://isisdemo.mmyco.co.uk/[Online demo] (todoapp)
-
* link:./screencasts.html[Screencasts] image:{_imagesdir}tv_show-25.png[width="25px" link="screencasts.html"]
* link:./guides/tg.html[Tutorials]
-* link:http://www.javadoc.io/doc/org.apache.isis.core/isis-core-applib/1.9.0[Javadoc] (not ASF)
+* link:http://www.javadoc.io/doc/org.apache.isis.core/isis-core-applib/1.9.0[Javadoc (for Applib)] (not ASF)
@@ -113,13 +111,17 @@ including:
[cols="1a,1a,1a",frame="none"]
|===
-|*Example Apps:*
+|*Example Apps (not ASF):*
+
+* http://github.com/estatio/estatio[Estatio]
+* http://github.com/isisaddons/isis-app-todoapp[TodoApp] (link:http://mmyco.co.uk:8180/todoapp/[online demo, v1.9.0])
+* http://github.com/isisaddons/isis-app-kitchensink[Kitchensink] (link:http://mmyco.co.uk:8180/kitchensink/[online demo, v1.9.0])
+* http://github.com/isisaddons/isis-app-neoapp[Neo4J Example]
+* http://github.com/isisaddons/isis-app-quickstart[Quickstart]
+* http://github.com/isisaddons/isis-app-simpledsl[Isis DSL Example]
+
+
-* http://github.com/estatio/estatio[Estatio] (not ASF)
-* http://github.com/isisaddons/isis-app-todoapp[TodoApp Example App] (not ASF)
-* http://github.com/isisaddons/isis-app-kitchensink[Kitchensink App] (not ASF)
-* http://github.com/isisaddons/isis-app-neoapp[Neo4J Example App] (not ASF)
-* http://github.com/isisaddons/isis-app-simpledsl[Isis DSL Example App] (not ASF)