From 419a69babe2107f6f95fb38978ee330e2f06f8d1 Mon Sep 17 00:00:00 2001 From: William Guo Date: Wed, 7 Jun 2017 12:59:08 +0800 Subject: [PATCH 1/2] update version in pom as 0.0.1 for first release --- measure/pom.xml | 24 ++++++- pom.xml | 64 +++++++++---------- service/pom.xml | 23 ++++++- .../griffin/core/schedule/JobHealth.java | 14 ++++ .../core/schedule/Repo/ScheduleStateRepo.java | 14 ++++ service/src/main/resources/Init_quartz.sql | 11 ++++ ui/pom.xml | 22 ++++++- 7 files changed, 132 insertions(+), 40 deletions(-) diff --git a/measure/pom.xml b/measure/pom.xml index 67649c5c3..c653f4b2b 100644 --- a/measure/pom.xml +++ b/measure/pom.xml @@ -1,10 +1,29 @@ + + 4.0.0 - org.apache.griffin + + com.apache.griffin + griffin + 0.0.1-incubating-SNAPSHOT + + measure - 0.1.0-SNAPSHOT jar Apache Griffin :: Measures @@ -173,7 +192,6 @@ jar-with-dependencies - griffin-measure false diff --git a/pom.xml b/pom.xml index cb83b5743..e59164c70 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,18 @@ + + 4.0.0 @@ -11,7 +26,7 @@ com.apache.griffin griffin - 0.1.0-SNAPSHOT + 0.0.1-incubating-SNAPSHOT pom Apache Griffin ${project.version} http://griffin.incubator.apache.org @@ -52,12 +67,11 @@ dev-subscribe@griffin.incubator.apache.org dev-unsubscribe@griffin.incubator.apache.org dev@griffin.incubator.apache.org - - - + + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git @@ -67,11 +81,6 @@ - - apache.website - Apache Griffin Website - scpexe://people.apache.org/www/incubator.apache.org/griffin - @@ -102,6 +111,7 @@ org.apache.maven.plugins maven-compiler-plugin + @@ -110,27 +120,18 @@ apache-release - - org.apache.maven.plugins - maven-gpg-plugin - - false - - - org.apache.rat apache-rat-plugin + ${maven-apache-rat.version} .git/ - .java-version .gitignore **/.idea/ - **/.cache-main **/.scalastyle/ **/*.iml **/.classpath @@ -141,8 +142,6 @@ **/*.patch **/*.rej - - **/gen/** README* **/*.log @@ -151,32 +150,31 @@ **/velocity.log* **/*.json - **/ui/bower_components/** + **/bower_components/** + **/apidocs/** **/fonts/** **/images/** - **/lib/js/** - **/lib/css/** **/*.min.js - **/jquery-*.js **/MANIFEST.MF - **/.json **/*.md **/*.asc - **/webapp/** + **/resources/public/** **/*.pid - **/buildNumber.properties addServer.py - - - griffin-doc/** - docker/** + travis-settings.xml + **/griffin-doc/** + **/docker/** + **/pom.xml.tag + **/build.xml + **/*.properties - verify + rat-check + validate check diff --git a/service/pom.xml b/service/pom.xml index 0bbf573a9..0df74b1f6 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -1,11 +1,30 @@ + + 4.0.0 - org.apache.griffin + + com.apache.griffin + griffin + 0.0.1-incubating-SNAPSHOT + + service jar - 0.1.0-SNAPSHOT Apache Griffin :: Web Service diff --git a/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java b/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java index 538a90914..56ed98170 100644 --- a/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java +++ b/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java @@ -1,3 +1,17 @@ +/*- + * Licensed 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.griffin.core.schedule; /** diff --git a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java index a04335330..4ab04f721 100644 --- a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java +++ b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java @@ -1,3 +1,17 @@ +/*- + * Licensed 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.griffin.core.schedule.Repo; import org.apache.griffin.core.schedule.ScheduleState; diff --git a/service/src/main/resources/Init_quartz.sql b/service/src/main/resources/Init_quartz.sql index 2a2d338c3..1914b44c5 100644 --- a/service/src/main/resources/Init_quartz.sql +++ b/service/src/main/resources/Init_quartz.sql @@ -1,4 +1,15 @@ # +#Licensed 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. # In your Quartz properties file, you'll need to set # org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate # diff --git a/ui/pom.xml b/ui/pom.xml index b8f9eb332..48cf5b6d6 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -1,10 +1,28 @@ + + 4.0.0 - org.apache.griffin + + com.apache.griffin + griffin + 0.0.1-incubating-SNAPSHOT + ui - 0.1.0-SNAPSHOT pom Apache Griffin :: UI :: Default UI From 2d7bbb90c72b075460920d09f1db7034eef7a130 Mon Sep 17 00:00:00 2001 From: William Guo Date: Wed, 7 Jun 2017 14:02:26 +0800 Subject: [PATCH 2/2] update disclaimer and notice --- DISCLAIMER | 1 + NOTICE | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 DISCLAIMER create mode 100644 NOTICE diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 000000000..37e747cbb --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1 @@ +Apache Griffin is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..47a30d431 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Griffin +Copyright 2016 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/).