From 33e23b2f98e1634a5314725682b4160829eb071d Mon Sep 17 00:00:00 2001 From: Nicolas Rempulski Date: Tue, 14 Feb 2017 11:59:06 +0100 Subject: [PATCH 1/3] Licence headers update --- .../java/todo/controllers/HomeController.java | 19 +++++++++++++++++++ .../java/todo/controllers/TodoController.java | 19 +++++++++++++++++++ .../src/main/java/todo/models/Todo.java | 19 +++++++++++++++++++ .../src/main/java/todo/models/TodoList.java | 19 +++++++++++++++++++ .../main/resources/META-INF/persistence.xml | 19 +++++++++++++++++++ .../assets/app/render/RactiveRenderService.js | 19 +++++++++++++++++++ .../assets/app/render/RenderService.js | 19 +++++++++++++++++++ .../assets/app/render/comp/RactiveRender.js | 19 +++++++++++++++++++ .../assets/libs/h-ubu-1.0.1-SNAPSHOT.js | 19 +++++++++++++++++++ .../assets/libs/ractive-events-keys.js | 19 +++++++++++++++++++ .../src/test/java/todo/models/TodoListIT.java | 19 +++++++++++++++++++ 11 files changed, 209 insertions(+) mode change 100755 => 100644 openjpa-sample/src/main/resources/assets/app/render/RactiveRenderService.js mode change 100755 => 100644 openjpa-sample/src/main/resources/assets/app/render/RenderService.js mode change 100755 => 100644 openjpa-sample/src/main/resources/assets/app/render/comp/RactiveRender.js mode change 100755 => 100644 openjpa-sample/src/main/resources/assets/libs/h-ubu-1.0.1-SNAPSHOT.js mode change 100755 => 100644 openjpa-sample/src/main/resources/assets/libs/ractive-events-keys.js diff --git a/openjpa-sample/src/main/java/todo/controllers/HomeController.java b/openjpa-sample/src/main/java/todo/controllers/HomeController.java index 3997bed..1bbc854 100644 --- a/openjpa-sample/src/main/java/todo/controllers/HomeController.java +++ b/openjpa-sample/src/main/java/todo/controllers/HomeController.java @@ -1,3 +1,22 @@ +/* + * #%L + * Wisdom-Framework + * %% + * Copyright (C) 2013 - 2016 Wisdom Framework + * %% + * 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. + * #L% + */ package todo.controllers; import org.wisdom.api.DefaultController; diff --git a/openjpa-sample/src/main/java/todo/controllers/TodoController.java b/openjpa-sample/src/main/java/todo/controllers/TodoController.java index 7bed603..506f526 100644 --- a/openjpa-sample/src/main/java/todo/controllers/TodoController.java +++ b/openjpa-sample/src/main/java/todo/controllers/TodoController.java @@ -1,3 +1,22 @@ +/* + * #%L + * Wisdom-Framework + * %% + * Copyright (C) 2013 - 2016 Wisdom Framework + * %% + * 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. + * #L% + */ package todo.controllers; import com.google.common.collect.Iterables; diff --git a/openjpa-sample/src/main/java/todo/models/Todo.java b/openjpa-sample/src/main/java/todo/models/Todo.java index fb1af15..3c764ed 100644 --- a/openjpa-sample/src/main/java/todo/models/Todo.java +++ b/openjpa-sample/src/main/java/todo/models/Todo.java @@ -1,3 +1,22 @@ +/* + * #%L + * Wisdom-Framework + * %% + * Copyright (C) 2013 - 2016 Wisdom Framework + * %% + * 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. + * #L% + */ package todo.models; import javax.persistence.Entity; diff --git a/openjpa-sample/src/main/java/todo/models/TodoList.java b/openjpa-sample/src/main/java/todo/models/TodoList.java index 85f7848..e9478b3 100644 --- a/openjpa-sample/src/main/java/todo/models/TodoList.java +++ b/openjpa-sample/src/main/java/todo/models/TodoList.java @@ -1,3 +1,22 @@ +/* + * #%L + * Wisdom-Framework + * %% + * Copyright (C) 2013 - 2016 Wisdom Framework + * %% + * 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. + * #L% + */ package todo.models; import javax.persistence.*; diff --git a/openjpa-sample/src/main/resources/META-INF/persistence.xml b/openjpa-sample/src/main/resources/META-INF/persistence.xml index 144bfe8..d69ea67 100644 --- a/openjpa-sample/src/main/resources/META-INF/persistence.xml +++ b/openjpa-sample/src/main/resources/META-INF/persistence.xml @@ -1,3 +1,22 @@ + Date: Tue, 14 Feb 2017 12:02:12 +0100 Subject: [PATCH 2/3] Update dependencies * OpenJPA 2.4.2 * HikariCP 2.6 * Database drivers update * Use main reactor properties to handle drivers & packaging versions --- openjpa-sample/pom.xml | 3 +-- pom.xml | 20 ++++++++++++++++++- wisdom-jdbc-datasources/pom.xml | 14 ++++++------- .../abstract-jdbc-driver/pom.xml | 2 +- wisdom-jdbc-drivers/derby/pom.xml | 6 +++--- wisdom-jdbc-drivers/h2/pom.xml | 6 +++--- wisdom-jdbc-drivers/hsql/pom.xml | 6 +++--- wisdom-jdbc-drivers/mysql/pom.xml | 6 +++--- wisdom-jdbc-drivers/postgresql/pom.xml | 6 +++--- wisdom-jdbc-drivers/sqlite/pom.xml | 6 +++--- wisdom-jpa-manager/pom.xml | 12 +++++------ 11 files changed, 52 insertions(+), 35 deletions(-) diff --git a/openjpa-sample/pom.xml b/openjpa-sample/pom.xml index 157e052..8cd91fb 100644 --- a/openjpa-sample/pom.xml +++ b/openjpa-sample/pom.xml @@ -30,7 +30,6 @@ org.wisdom-framework.jdbc openjpa-sample - 0.10.0-SNAPSHOT wisdom @@ -94,7 +93,7 @@ org.wisdom-framework h2 - 1.4.191_1-SNAPSHOT + ${wisdom.h2.version} diff --git a/pom.xml b/pom.xml index 9a8a6c0..15aa8bc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,25 @@ 0.10.0-SNAPSHOT - 2.4.1 + ${wisdom.version} + + 2.4.2 + 2.6.0 + + 10.13.1.1 + 1.4.193 + 2.3.4 + 5.1.40 + 9.4.1212 + 3.16.1 + + 0.10.0-SNAPSHOT + ${derby.version}_1-SNAPSHOT + ${h2.version}_1-SNAPSHOT + ${hsql.version}_1-SNAPSHOT + ${mysql.version}_1-SNAPSHOT + ${postgresql.version}_1-SNAPSHOT + ${sqlite.version}_1-SNAPSHOT pom diff --git a/wisdom-jdbc-datasources/pom.xml b/wisdom-jdbc-datasources/pom.xml index 6f42971..f6de254 100644 --- a/wisdom-jdbc-datasources/pom.xml +++ b/wisdom-jdbc-datasources/pom.xml @@ -35,48 +35,48 @@ com.zaxxer HikariCP - 2.4.4 + ${hikaricp.version} org.wisdom-framework h2 - 1.4.191_1-SNAPSHOT + ${wisdom.h2.version} test org.wisdom-framework derby - 10.12.1.1_1-SNAPSHOT + ${wisdom.derby.version} test org.wisdom-framework hsqldb - 2.3.3_1-SNAPSHOT + ${wisdom.hsql.version} test org.wisdom-framework sqlite-jdbc - 3.8.11.2_1-SNAPSHOT + ${wisdom.sqlite.version} test org.wisdom-framework mysql-connector-java - 5.1.38_1-SNAPSHOT + ${wisdom.mysql.version} test org.wisdom-framework postgresql - 9.4.1208_1-SNAPSHOT + ${wisdom.postgresql.version} test diff --git a/wisdom-jdbc-drivers/abstract-jdbc-driver/pom.xml b/wisdom-jdbc-drivers/abstract-jdbc-driver/pom.xml index 295243a..2821852 100644 --- a/wisdom-jdbc-drivers/abstract-jdbc-driver/pom.xml +++ b/wisdom-jdbc-drivers/abstract-jdbc-driver/pom.xml @@ -44,7 +44,7 @@ org.apache.derby derby - 10.8.2.2 + ${derby.version} test diff --git a/wisdom-jdbc-drivers/derby/pom.xml b/wisdom-jdbc-drivers/derby/pom.xml index 9f35dc4..cfa4a5c 100644 --- a/wisdom-jdbc-drivers/derby/pom.xml +++ b/wisdom-jdbc-drivers/derby/pom.xml @@ -9,7 +9,7 @@ derby - 10.12.1.1_1-SNAPSHOT + ${wisdom.derby.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ org.apache.derby derby - 10.12.1.1 + ${derby.version} provided diff --git a/wisdom-jdbc-drivers/h2/pom.xml b/wisdom-jdbc-drivers/h2/pom.xml index 6f5a0b1..f0a2475 100644 --- a/wisdom-jdbc-drivers/h2/pom.xml +++ b/wisdom-jdbc-drivers/h2/pom.xml @@ -9,7 +9,7 @@ h2 - 1.4.191_1-SNAPSHOT + ${wisdom.h2.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ com.h2database ${project.artifactId} - 1.4.191 + ${h2.version} provided diff --git a/wisdom-jdbc-drivers/hsql/pom.xml b/wisdom-jdbc-drivers/hsql/pom.xml index e33e86f..4e38b59 100644 --- a/wisdom-jdbc-drivers/hsql/pom.xml +++ b/wisdom-jdbc-drivers/hsql/pom.xml @@ -9,7 +9,7 @@ hsqldb - 2.3.3_1-SNAPSHOT + ${wisdom.hsql.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ org.hsqldb hsqldb - 2.3.3 + ${hsql.version} diff --git a/wisdom-jdbc-drivers/mysql/pom.xml b/wisdom-jdbc-drivers/mysql/pom.xml index ec4c631..f1bd6cf 100644 --- a/wisdom-jdbc-drivers/mysql/pom.xml +++ b/wisdom-jdbc-drivers/mysql/pom.xml @@ -9,7 +9,7 @@ mysql-connector-java - 5.1.38_1-SNAPSHOT + ${wisdom.mysql.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ mysql mysql-connector-java - 5.1.38 + ${mysql.version} provided diff --git a/wisdom-jdbc-drivers/postgresql/pom.xml b/wisdom-jdbc-drivers/postgresql/pom.xml index 4e7d2b3..222c46c 100644 --- a/wisdom-jdbc-drivers/postgresql/pom.xml +++ b/wisdom-jdbc-drivers/postgresql/pom.xml @@ -9,7 +9,7 @@ postgresql - 9.4.1208_1-SNAPSHOT + ${wisdom.postgresql.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ org.postgresql postgresql - 9.4.1208 + ${postgresql.version} diff --git a/wisdom-jdbc-drivers/sqlite/pom.xml b/wisdom-jdbc-drivers/sqlite/pom.xml index 0096416..ea4f8be 100644 --- a/wisdom-jdbc-drivers/sqlite/pom.xml +++ b/wisdom-jdbc-drivers/sqlite/pom.xml @@ -9,7 +9,7 @@ sqlite-jdbc - 3.8.11.2_1-SNAPSHOT + ${wisdom.sqlite.version} bundle @@ -20,7 +20,7 @@ org.wisdom-framework abstract-jdbc-driver - 0.10.0-SNAPSHOT + ${wisdom.abstractjdbcdriver.version} @@ -31,7 +31,7 @@ org.xerial sqlite-jdbc - 3.8.11.2 + ${sqlite.version} provided diff --git a/wisdom-jpa-manager/pom.xml b/wisdom-jpa-manager/pom.xml index 719a928..150b88c 100644 --- a/wisdom-jpa-manager/pom.xml +++ b/wisdom-jpa-manager/pom.xml @@ -40,7 +40,7 @@ org.apache.geronimo.components geronimo-transaction - 3.1.3 + 3.1.4 provided @@ -136,7 +136,7 @@ com.zaxxer HikariCP - 2.4.4 + ${hikaricp.version} test @@ -152,14 +152,14 @@ com.h2database h2 - 1.4.191 + ${h2.version} provided org.wisdom-framework h2 - 1.4.191_1-SNAPSHOT + ${wisdom.h2.version} test @@ -193,7 +193,7 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.2 + 2.3 xjc @@ -232,7 +232,7 @@ org.apache.openjpa openjpa-maven-plugin - 2.4.1 + ${openjpa.version} **/entities/**/*.class true From dc94870c2df79f4ff57027ccba0d424e25bd1580 Mon Sep 17 00:00:00 2001 From: Nicolas Rempulski Date: Wed, 16 Aug 2017 15:36:38 +0200 Subject: [PATCH 3/3] Update dependencies (August 2017) --- pom.xml | 12 ++++++------ wisdom-jpa-manager/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 15aa8bc..e08d28d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,14 +18,14 @@ ${wisdom.version} 2.4.2 - 2.6.0 + 2.6.3 10.13.1.1 - 1.4.193 - 2.3.4 - 5.1.40 - 9.4.1212 - 3.16.1 + 1.4.196 + 2.4.0 + 5.1.43 + 42.1.4 + 3.20.0 0.10.0-SNAPSHOT ${derby.version}_1-SNAPSHOT diff --git a/wisdom-jpa-manager/pom.xml b/wisdom-jpa-manager/pom.xml index 150b88c..01de886 100644 --- a/wisdom-jpa-manager/pom.xml +++ b/wisdom-jpa-manager/pom.xml @@ -193,7 +193,7 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.3 + 2.3.1 xjc