You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2022/05/15 15:09:55 UTC
[juddi] 03/08: JUDDI-978 resolves merge issues
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch feature/JUDDI-978
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 47accac9ad450f77294bef3b25f3543bc3f7f6d2
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Mon Jan 20 16:40:09 2020 -0500
JUDDI-978 resolves merge issues
---
docs/pom.xml | 1 -
juddiv3-war/pom.xml | 6 +-----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/docs/pom.xml b/docs/pom.xml
index cb36abb80..3cf17af98 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,6 @@
<modules>
- <module>asciidoc</module>
<module>dist</module>
</modules>
</project>
diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml
index 810f80c3a..405929861 100644
--- a/juddiv3-war/pom.xml
+++ b/juddiv3-war/pom.xml
@@ -328,11 +328,7 @@ language governing permissions and * limitations under the License. * */ -->
<artifactId>jettison</artifactId>
</dependency>
<!--END added AO 6/8/2013 support for JSON encoding on REST endpoints -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org