diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/sca/CHANGES (renamed from java/sca/distribution/all/src/main/release/CHANGES) | 0 | ||||
| -rw-r--r-- | java/sca/README (renamed from java/sca/distribution/all/src/main/release/README) | 0 | ||||
| -rw-r--r-- | java/sca/RELEASE_NOTES (renamed from java/sca/distribution/all/src/main/release/RELEASE_NOTES) | 0 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/assembly/src.xml | 11 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/components/bin-common.xml | 87 |
5 files changed, 44 insertions, 54 deletions
diff --git a/java/sca/distribution/all/src/main/release/CHANGES b/java/sca/CHANGES index d02a5289e5..d02a5289e5 100644 --- a/java/sca/distribution/all/src/main/release/CHANGES +++ b/java/sca/CHANGES diff --git a/java/sca/distribution/all/src/main/release/README b/java/sca/README index e0869c7d27..e0869c7d27 100644 --- a/java/sca/distribution/all/src/main/release/README +++ b/java/sca/README diff --git a/java/sca/distribution/all/src/main/release/RELEASE_NOTES b/java/sca/RELEASE_NOTES index 4aa75e33fa..4aa75e33fa 100644 --- a/java/sca/distribution/all/src/main/release/RELEASE_NOTES +++ b/java/sca/RELEASE_NOTES diff --git a/java/sca/distribution/all/src/main/assembly/src.xml b/java/sca/distribution/all/src/main/assembly/src.xml index e2d3fc641c..237ae4428d 100644 --- a/java/sca/distribution/all/src/main/assembly/src.xml +++ b/java/sca/distribution/all/src/main/assembly/src.xml @@ -29,15 +29,6 @@ <fileSets>
<fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../..</directory>
<outputDirectory></outputDirectory>
<excludes>
@@ -45,7 +36,7 @@ <exclude>**/.*/**</exclude>
<exclude>**/*.log</exclude>
<exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude> + <exclude>**/target/**/*</exclude>
<exclude>**/binding-dwr-runtime</exclude>
<exclude>**/binding-dwr-runtime/**/*</exclude>
<exclude>**/maven-eclipse.xml</exclude>
diff --git a/java/sca/distribution/all/src/main/components/bin-common.xml b/java/sca/distribution/all/src/main/components/bin-common.xml index c69e8e3699..983b6addff 100644 --- a/java/sca/distribution/all/src/main/components/bin-common.xml +++ b/java/sca/distribution/all/src/main/components/bin-common.xml @@ -1,44 +1,43 @@ -<!-- - * 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. ---> -<component> - <fileSets> - - <!-- Add the text files to the top-level directroy --> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory></outputDirectory> - <includes> - <include>CHANGES</include> - <include>DISCLAIMER</include> - <include>README</include> - <include>RELEASE_NOTES</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/bin</directory> - <outputDirectory></outputDirectory> - <includes> - <include>INSTALL</include> - <include>LICENSE</include> - <include>NOTICE</include> - </includes> - </fileSet> - </fileSets> - -</component> +<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+
+ <!-- Add the text files to the top-level directroy -->
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>CHANGES</include>
+ <include>README</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/bin</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>INSTALL</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</component>
|