You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sd...@apache.org on 2016/04/29 11:51:41 UTC
commons-crypto git commit: CRYPTO-43: Add assembly for release and
fix header
Repository: commons-crypto
Updated Branches:
refs/heads/master 03d0ea013 -> b08de7798
CRYPTO-43: Add assembly for release and fix header
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/b08de779
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/b08de779
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/b08de779
Branch: refs/heads/master
Commit: b08de7798d4655d3437d7418e5e894621e26fb7e
Parents: 03d0ea0
Author: Sun Dapeng <sd...@apache.org>
Authored: Fri Apr 29 16:52:55 2016 +0800
Committer: Sun Dapeng <sd...@apache.org>
Committed: Fri Apr 29 17:48:42 2016 +0800
----------------------------------------------------------------------
.travis.yml | 10 -----
Makefile | 17 ++++++++
Makefile.common | 19 ++++++++-
lib/META-INF/CompilerHints | 0
lib/META-INF/MicroBenchmarks | 0
lib/include/config.h | 17 ++++++++
pom.xml | 12 ------
src/assembly/bin.xml | 43 ++++++++++++++++++++
src/assembly/src.xml | 40 ++++++++++++++++++
src/main/java/org/apache/commons/crypto/VERSION | 16 ++++++++
10 files changed, 151 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 43b8105..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: java
-jdk:
- - openjdk6
- - oraclejdk7
-script:
- - mvn apache-rat:check
- - mvn clean test
- - jdk_switcher use oraclejdk7
- - mvn test -Pfindbugs
-
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9190e25..9759b06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,20 @@
+#
+# 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.
+#
include Makefile.common
MVN:=mvn
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/Makefile.common
----------------------------------------------------------------------
diff --git a/Makefile.common b/Makefile.common
index e6ddbfb..d806be2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,3 +1,20 @@
+#
+# 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.
+#
TARGET:=target
SRC:=src/main/java
SRC_NATIVE:=src/main/native
@@ -257,4 +274,4 @@ CXXFLAGS := $(CXXFLAGS) -Ilib/include -I/usr/include
ifneq ($(jni_include),)
CFLAGS := $(CFLAGS) -I"$(jni_include)" -I"$(TARGET)/jni-classes/org/apache/commons/crypto/cipher" -I"$(TARGET)/jni-classes/org/apache/commons/crypto/random"
CXXFLAGS := $(CXXFLAGS) -I"$(jni_include)" -I"$(TARGET)/jni-classes/org/apache/commons/crypto/cipher" -I"$(TARGET)/jni-classes/org/apache/commons/crypto/random"
-endif
\ No newline at end of file
+endif
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/lib/META-INF/CompilerHints
----------------------------------------------------------------------
diff --git a/lib/META-INF/CompilerHints b/lib/META-INF/CompilerHints
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/lib/META-INF/MicroBenchmarks
----------------------------------------------------------------------
diff --git a/lib/META-INF/MicroBenchmarks b/lib/META-INF/MicroBenchmarks
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/lib/include/config.h
----------------------------------------------------------------------
diff --git a/lib/include/config.h b/lib/include/config.h
index 6c22f9e..77cfa79 100755
--- a/lib/include/config.h
+++ b/lib/include/config.h
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
#ifndef __CONFIG_H
#define __CONFIG_H
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6522e9f..2245a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,18 +314,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${commons.rat.version}</version>
- <configuration>
- <excludes>
- <exclude>*.cache</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>lib/</exclude>
- <exclude>Makefile</exclude>
- <exclude>Makefile.common</exclude>
- <exclude>project/project/target/config-classes/*</exclude>
- <exclude>project/target/</exclude>
- <exclude>src/main/java/org/apache/commons/crypto/VERSION</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
new file mode 100644
index 0000000..cf524c3
--- /dev/null
+++ b/src/assembly/bin.xml
@@ -0,0 +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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory/>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 0000000..cad329e
--- /dev/null
+++ b/src/assembly/src.xml
@@ -0,0 +1,40 @@
+<!--
+
+ 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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>Makefile</include>
+ <include>Makefile.common</include>
+ <include>README.md</include>
+ <include>findbugs-exclude.xml</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/b08de779/src/main/java/org/apache/commons/crypto/VERSION
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/VERSION b/src/main/java/org/apache/commons/crypto/VERSION
index baca170..554d49f 100644
--- a/src/main/java/org/apache/commons/crypto/VERSION
+++ b/src/main/java/org/apache/commons/crypto/VERSION
@@ -1 +1,17 @@
+#
+# 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.
+#
VERSION=1.0.0-SNAPSHOT