You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/07/02 17:21:01 UTC
commons-crypto git commit: CRYPTO-100 Makefile does not need to
include VERSION file
Repository: commons-crypto
Updated Branches:
refs/heads/master 139c3f3c1 -> 173e12382
CRYPTO-100 Makefile does not need to include VERSION file
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/173e1238
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/173e1238
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/173e1238
Branch: refs/heads/master
Commit: 173e12382ee9e8ead2cf5ac48bce6e0e159f0080
Parents: 139c3f3
Author: Sebb <se...@apache.org>
Authored: Sat Jul 2 18:20:57 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Sat Jul 2 18:20:57 2016 +0100
----------------------------------------------------------------------
Makefile.common | 5 ++++-
pom.xml | 1 +
.../resources/org/apache/commons/crypto/VERSION | 17 -----------------
3 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/173e1238/Makefile.common
----------------------------------------------------------------------
diff --git a/Makefile.common b/Makefile.common
index 7d2e59d..57fd7e0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -22,7 +22,10 @@
TARGET:=target
SRC:=src/main/java
SRC_NATIVE:=src/main/native
-include $(TARGET)/classes/org/apache/commons/crypto/VERSION
+
+ifndef VERSION
+$(error Set VERSION environment variable)
+endif
ifndef JAVA_HOME
$(error Set JAVA_HOME environment variable)
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/173e1238/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e5dbcdf..6950f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,6 +467,7 @@ The following provides more details on the included cryptographic software:
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath"/>
<exec executable="make" failonerror="true" dir="${project.basedir}">
+ <env key="VERSION" value="${project.version}"/>
<!-- For debugging: -->
<!-- <arg value="-d"/> -->
<arg value="${target.name}"/>
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/173e1238/src/main/resources/org/apache/commons/crypto/VERSION
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/commons/crypto/VERSION b/src/main/resources/org/apache/commons/crypto/VERSION
deleted file mode 100644
index e7fe706..0000000
--- a/src/main/resources/org/apache/commons/crypto/VERSION
+++ /dev/null
@@ -1,17 +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.
-#
-VERSION=${project.version}