This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch javax
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/javax by this push:
new f18d074d8 TAP5-2804: fixing bad merge on tapestry-core/build.gradle
f18d074d8 is described below
commit f18d074d8d88ebc02b614b49e08cfa325a5a3a58
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Jun 14 10:11:49 2025 -0300
TAP5-2804: fixing bad merge on tapestry-core/build.gradle
---
tapestry-core/build.gradle | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index e28d904a4..e985abf06 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -1,5 +1,4 @@
import org.gradle.plugins.ide.idea.model.*
-
import org.apache.tools.ant.filters.ReplaceTokens
//import t5build.*
@@ -23,12 +22,9 @@ dependencies {
implementation 'jakarta.annotation:jakarta.annotation-api:1.3.4'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2'
-<<<<<<< HEAD
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
implementation 'com.sun.xml.ws:jaxws-rt:2.3.2'
implementation 'javax.xml.ws:jaxws-api:2.3.1'
-=======
->>>>>>> 4cee8eebde (TAP5-2804: Convert Tapestry JS sources from CoffeeScript
to TypeScript (#53))
provided project(":tapestry-test")
provided project(":tapestry-test-constants")
