You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/01/12 03:12:06 UTC
[cxf] branch 3.4.x-fixes updated (7070830 -> f91e3aa)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 7070830 CXF-8632: StaxTransformFeature deep-dropping doesn't work with any element (#887)
new 9ac9443 Removing dead modules: jcs-parent and jcs
new f91e3aa Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 +
rt/rs/security/jcs-parent/jcs/pom.xml | 54 ----------------------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 ---------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 ---------
rt/rs/security/jcs-parent/pom.xml | 35 --------------
5 files changed, 2 insertions(+), 135 deletions(-)
delete mode 100644 rt/rs/security/jcs-parent/jcs/pom.xml
delete mode 100644 rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java
delete mode 100644 rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java
delete mode 100644 rt/rs/security/jcs-parent/pom.xml
[cxf] 01/02: Removing dead modules: jcs-parent and jcs
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9ac9443d55d3fda487ae200232f19b8f685a7c0a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 11 19:46:38 2022 -0500
Removing dead modules: jcs-parent and jcs
(cherry picked from commit 88ba228e96a81aeded38228ef94914612a7968be)
(cherry picked from commit 43685465a83a5bd22bd34b8d893ce5aa5f2e1ab4)
---
rt/rs/security/jcs-parent/jcs/pom.xml | 54 ----------------------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 ---------
.../apache/cxf/rs/security/jcs/TempResource.java | 23 ---------
rt/rs/security/jcs-parent/pom.xml | 35 --------------
4 files changed, 135 deletions(-)
diff --git a/rt/rs/security/jcs-parent/jcs/pom.xml b/rt/rs/security/jcs-parent/jcs/pom.xml
deleted file mode 100644
index 6bfeabe..0000000
--- a/rt/rs/security/jcs-parent/jcs/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-rs-security-jcs</artifactId>
- <packaging>bundle</packaging>
- <name>Apache CXF Runtime JSON Clear Signature Core</name>
- <description>Apache CXF Runtime JSON Clear Signature Core</description>
- <url>https://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <relativePath>../../../../../parent/pom.xml</relativePath>
- </parent>
- <properties>
- <cxf.module.name>org.apache.cxf.rs.security.jcs</cxf.module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--test dependencies-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java b/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java
deleted file mode 100644
index e0e1372..0000000
--- a/rt/rs/security/jcs-parent/jcs/src/main/java/org/apache/cxf/rs/security/jcs/TempResource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.cxf.rs.security.jcs;
-
-public class TempResource {
-}
diff --git a/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java b/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java
deleted file mode 100644
index e0e1372..0000000
--- a/rt/rs/security/jcs-parent/jcs/src/test/java/org/apache/cxf/rs/security/jcs/TempResource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.cxf.rs.security.jcs;
-
-public class TempResource {
-}
diff --git a/rt/rs/security/jcs-parent/pom.xml b/rt/rs/security/jcs-parent/pom.xml
deleted file mode 100644
index 5ee7995..0000000
--- a/rt/rs/security/jcs-parent/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-rs-security-jcs-parent</artifactId>
- <packaging>pom</packaging>
- <name>Apache CXF JSON Clear Signature parent</name>
- <description>Apache CXF JSON Clear Signature parent</description>
- <url>https://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- </parent>
- <modules>
- <module>jcs</module>
- </modules>
-</project>
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f91e3aac4363ab7d32b3c4750c64ff4ce7243a81
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 11 21:39:47 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 844428c..6f37d89 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,7 @@
origin/3.5.x-fixes
B 0083762ff155273ee274581f85dd97a7d20b971c
+B 01608bf2a97a9daf2954da4a6e90ba7e3ae40c1c
B 03110cf694be67611ea28e6d6cdefa0dd462e302
B 04876cc1556108d78c04653cd22867fb295cfff8
B 06db9172c41e43552897e1ec388ac96e0699c6bf
@@ -262,6 +263,7 @@ M c4225cad3036a36f3a7f8c4a46a7633a92989a93
M c741a057830f5a661ad51869b11704253a272a89
M c7786d4e78999cb08fd668b24a7fac480bf7b5e0
M ca5d02bf9581a28971c8b8d021732972dce5377e
+M caccb85c0007c80a0f62041825dbdaf3976f83b1
M cc07aa8a16ea65b446e1b1988135234e91ae49bd
M cc4f758e89da58b2f47c95fb68df186e0533ca74
M ccb76b7c2c02b0f295405fd9bb0b585544c40869