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 2019/01/12 11:57:11 UTC
[isis] branch release-2.0.0-M2-RC1 created (now 75262f8)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M2-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 75262f8 ISIS-1811: adds missing license headers
This branch includes the following new commits:
new 0b83fa7 ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2
new 75262f8 ISIS-1811: adds missing license headers
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 02/02: ISIS-1811: adds missing license headers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M2-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 75262f8e334cedd46f0b95fbb7736e7d01cbb163
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 12 11:56:48 2019 +0000
ISIS-1811: adds missing license headers
---
core/webserver/config/isis.properties | 16 ++++++++++++++++
.../apache/isis/core/webserver/DummyAppManifest.java | 18 ++++++++++++++++++
.../isis/core/webserver/HelloWorldAppConfigTest.java | 18 ++++++++++++++++++
3 files changed, 52 insertions(+)
diff --git a/core/webserver/config/isis.properties b/core/webserver/config/isis.properties
index 3a4de45..7a1f344 100644
--- a/core/webserver/config/isis.properties
+++ b/core/webserver/config/isis.properties
@@ -1 +1,17 @@
+# 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.
isis.appManifest=org.apache.isis.core.webserver.DummyAppManifest
\ No newline at end of file
diff --git a/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java b/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java
index 27a0a62..e6565db 100644
--- a/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java
+++ b/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java
@@ -1,3 +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.
+ */
package org.apache.isis.core.webserver;
import org.apache.isis.applib.AppManifestAbstract2;
diff --git a/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
index 3856bbd..e9332be 100644
--- a/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
+++ b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
@@ -1,3 +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.
+ */
package org.apache.isis.core.webserver;
import java.util.Map;
[isis] 01/02: ISIS-1811: bumps revision property across all
pom.xml's to 2.0.0-M2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M2-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0b83fa744a67eed636188804f142dcc6d83849c1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 12 11:47:35 2019 +0000
ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2
---
core/pom.xml | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3829d2e..b954437 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,7 +46,7 @@
<inceptionYear>2010</inceptionYear>
<properties>
- <revision>2.0.0-M2-SNAPSHOT</revision>
+ <revision>2.0.0-M2</revision>
<isis.version>${revision}</isis.version>
<isis.skipTests>false</isis.skipTests>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 9c2adcc..a837ebe 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <revision>2.0.0-M2-SNAPSHOT</revision>
+ <revision>2.0.0-M2</revision>
<isis.version>${revision}</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index b241150..5a0c3ad 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.0.0-M2-SNAPSHOT</revision>
+ <revision>2.0.0-M2</revision>
<isis.version>${revision}</isis.version>
<!-- bumping to 1.18.4 causes a conflict with DataNucleus' annotation processor. -->