This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/gradle-improvements by this
push:
new ef13c1112 TAP5-2809: minor gradle code styling and cleanup
ef13c1112 is described below
commit ef13c11125df798d76e470756724bf727ff878ce
Author: Ben Weidig <[email protected]>
AuthorDate: Sat Sep 20 14:16:44 2025 +0200
TAP5-2809: minor gradle code styling and cleanup
---
gradle/libs.versions.toml | 1 +
plastic/build.gradle | 2 +-
tapestry-cdi/build.gradle | 7 +++----
.../apache/tapestry5/clojure/tests/TestModule.java | 2 +-
tapestry-hibernate/build.gradle | 2 +-
.../tapestry5/http/test/services/AppModule.java | 1 -
tapestry-ioc-jcache/build.gradle | 12 ++++++------
.../app5/DummyEntityManagerFactory.java | 22 +++++++++++-----------
.../integration/app5/DummyPersistenceProvider.java | 1 +
tapestry-kaptcha/build.gradle | 1 +
10 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 744bee668..ccd3c5491 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -75,6 +75,7 @@ quickstart-maven-war = "3.3.1"
quickstart-maven-jetty = "11.0.15"
quickstart-gretty = "3.0.6"
+
[libraries]
# LOGGING
diff --git a/plastic/build.gradle b/plastic/build.gradle
index b4a60dfb7..35f5d8103 100644
--- a/plastic/build.gradle
+++ b/plastic/build.gradle
@@ -15,4 +15,4 @@ sourceSets {
srcDir 'src/external/java'
}
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-cdi/build.gradle b/tapestry-cdi/build.gradle
index 3c1fe02fe..85bf10ac8 100644
--- a/tapestry-cdi/build.gradle
+++ b/tapestry-cdi/build.gradle
@@ -10,7 +10,6 @@ description = 'Bridge to CDI for Apache Tapestry 5 Project'
buildDir = 'target/gradle-build'
def moduleLibs = [
- javaeeapi: '6.0-4',
tomee: 'org.apache.openejb:arquillian-tomee-embedded:1.6.0',
ziplock: 'org.apache.openejb:ziplock:1.5.1',
arquillianJunitContainer:
'org.jboss.arquillian.junit:arquillian-junit-container:1.1.1.Final',
@@ -70,10 +69,10 @@ sourceSets {
}
idea {
- module {
- scopes.PROVIDED.plus += configurations.compileOnly
- }
+ module {
+ scopes.PROVIDED.plus += configurations.compileOnly
}
+}
eclipse {
classpath {
diff --git
a/tapestry-clojure/src/test/java/org/apache/tapestry5/clojure/tests/TestModule.java
b/tapestry-clojure/src/test/java/org/apache/tapestry5/clojure/tests/TestModule.java
index ea8b0cff8..52689e5d2 100644
---
a/tapestry-clojure/src/test/java/org/apache/tapestry5/clojure/tests/TestModule.java
+++
b/tapestry-clojure/src/test/java/org/apache/tapestry5/clojure/tests/TestModule.java
@@ -2,7 +2,6 @@ package org.apache.tapestry5.clojure.tests;
import org.apache.tapestry5.clojure.ClojureBuilder;
import org.apache.tapestry5.commons.MappedConfiguration;
-import org.apache.tapestry5.http.TapestryHttpConstants;
import org.apache.tapestry5.http.internal.TapestryHttpInternalConstants;
import org.apache.tapestry5.ioc.annotations.Contribute;
import org.apache.tapestry5.ioc.services.ApplicationDefaults;
@@ -17,6 +16,7 @@ public class TestModule
{
conf.add(TapestryHttpInternalConstants.TAPESTRY_APP_PACKAGE_PARAM,
"test");
}
+
public static Fixture buildFixture(ClojureBuilder builder)
{
return builder.build(Fixture.class);
diff --git a/tapestry-hibernate/build.gradle b/tapestry-hibernate/build.gradle
index e0f20ce41..de74ab1cd 100644
--- a/tapestry-hibernate/build.gradle
+++ b/tapestry-hibernate/build.gradle
@@ -30,4 +30,4 @@ tasks.named('jar', Jar) {
manifest {
attributes 'Tapestry-Module-Classes':
'org.apache.tapestry5.hibernate.web.modules.HibernateModule'
}
-}
\ No newline at end of file
+}
diff --git
a/tapestry-http/src/test/java/org/apache/tapestry5/http/test/services/AppModule.java
b/tapestry-http/src/test/java/org/apache/tapestry5/http/test/services/AppModule.java
index f3c8e7e5c..ce01d3601 100644
---
a/tapestry-http/src/test/java/org/apache/tapestry5/http/test/services/AppModule.java
+++
b/tapestry-http/src/test/java/org/apache/tapestry5/http/test/services/AppModule.java
@@ -3,7 +3,6 @@ package org.apache.tapestry5.http.test.services;
import org.apache.tapestry5.commons.MappedConfiguration;
import org.apache.tapestry5.commons.OrderedConfiguration;
import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
-import org.apache.tapestry5.http.internal.TapestryHttpInternalConstants;
import org.apache.tapestry5.http.services.CompressionAnalyzer;
import org.apache.tapestry5.http.services.Dispatcher;
import org.apache.tapestry5.http.services.HttpServletRequestFilter;
diff --git a/tapestry-ioc-jcache/build.gradle b/tapestry-ioc-jcache/build.gradle
index 93d85c808..0f8a8c7ef 100644
--- a/tapestry-ioc-jcache/build.gradle
+++ b/tapestry-ioc-jcache/build.gradle
@@ -31,11 +31,11 @@ tasks.named('jar', Jar) {
test {
if (JavaVersion.current().isJava9Compatible()) {
- jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED'
- jvmArgs '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED'
- jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED'
- jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
- jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED'
- jvmArgs '--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED'
+ jvmArgs '--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED'
}
}
diff --git
a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
index f7ea256fd..536812067 100644
---
a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
+++
b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
@@ -84,32 +84,32 @@ final class DummyEntityManagerFactory implements
EntityManagerFactory
}
@Override
- public EntityManager createEntityManager(SynchronizationType
synchronizationType) {
- // TODO Auto-generated method stub
+ public EntityManager createEntityManager(SynchronizationType
synchronizationType)
+ {
return null;
}
@Override
- public EntityManager createEntityManager(SynchronizationType
synchronizationType, Map map) {
- // TODO Auto-generated method stub
+ public EntityManager createEntityManager(SynchronizationType
synchronizationType, Map map)
+ {
return null;
}
@Override
- public void addNamedQuery(String name, Query query) {
- // TODO Auto-generated method stub
-
+ public void addNamedQuery(String name, Query query)
+ {
+
}
@Override
- public <T> T unwrap(Class<T> cls) {
- // TODO Auto-generated method stub
+ public <T> T unwrap(Class<T> cls)
+ {
return null;
}
@Override
- public <T> void addNamedEntityGraph(String graphName, EntityGraph<T>
entityGraph)
+ public <T> void addNamedEntityGraph(String graphName, EntityGraph<T>
entityGraph)
{
- // TODO Auto-generated method stub
+
}
}
diff --git
a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
index 95490043c..a3a221a26 100644
---
a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
+++
b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
@@ -44,6 +44,7 @@ public class DummyPersistenceProvider implements
PersistenceProvider
@Override
public void generateSchema(PersistenceUnitInfo info, Map map)
{
+
}
@Override
diff --git a/tapestry-kaptcha/build.gradle b/tapestry-kaptcha/build.gradle
index 343262a42..88c8a882c 100644
--- a/tapestry-kaptcha/build.gradle
+++ b/tapestry-kaptcha/build.gradle
@@ -7,6 +7,7 @@ description = 'Kaptcha user verification support'
def moduleLibs= [
kaptcha: 'com.github.axet:kaptcha:0.0.8',
]
+
dependencies {
implementation project(':tapestry-core')
