Skip to content

Commit

Permalink
IGNITE-11084 copyrights date now depend on build date. (apache#5930)
Browse files Browse the repository at this point in the history
(cherry picked from commit 01a5a91)
  • Loading branch information
aealeksandrov committed Jan 28, 2019
1 parent 93cebcd commit ad665d3
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 2 deletions.
Expand Up @@ -37,6 +37,9 @@ public class IgniteVersionUtils {
/** Build timestamp in seconds. */
public static final long BUILD_TSTAMP;

/** Build timestamp string property value. */
private static final String BUILD_TSTAMP_FROM_PROPERTY;

/** Revision hash. */
public static final String REV_HASH_STR;

Expand All @@ -47,7 +50,7 @@ public class IgniteVersionUtils {
public static final String ACK_VER_STR;

/** Copyright blurb. */
public static final String COPYRIGHT = "2018 Copyright(C) Apache Software Foundation";
public static final String COPYRIGHT;

/**
* Static initializer.
Expand All @@ -58,10 +61,18 @@ public class IgniteVersionUtils {
.replace(".b", "-b")
.replace(".final", "-final");

BUILD_TSTAMP = Long.valueOf(IgniteProperties.get("ignite.build"));
BUILD_TSTAMP_FROM_PROPERTY = IgniteProperties.get("ignite.build");

//Development ignite.properties file contains ignite.build = 0, so we will add the check for it.
BUILD_TSTAMP = !BUILD_TSTAMP_FROM_PROPERTY.isEmpty() && Long.parseLong(BUILD_TSTAMP_FROM_PROPERTY) != 0
? Long.parseLong(BUILD_TSTAMP_FROM_PROPERTY) : System.currentTimeMillis() / 1000;

BUILD_TSTAMP_STR = new SimpleDateFormat("yyyyMMdd").format(new Date(BUILD_TSTAMP * 1000));

COPYRIGHT = BUILD_TSTAMP_STR.substring(0, 4) + " Copyright(C) Apache Software Foundation";

REV_HASH_STR = IgniteProperties.get("ignite.revision");

RELEASE_DATE_STR = IgniteProperties.get("ignite.rel.date");

String rev = REV_HASH_STR.length() > 8 ? REV_HASH_STR.substring(0, 8) : REV_HASH_STR;
Expand Down
@@ -0,0 +1,41 @@
/*
* 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.ignite.internal;

import java.util.Calendar;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/**
*/
@RunWith(JUnit4.class)
public class IgniteVersionUtilsSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
@Test
public void testIgniteCopyrights() throws Exception {
final String COPYRIGHT = String.valueOf(Calendar.getInstance().get(Calendar.YEAR)) + " Copyright(C) Apache Software Foundation";

assertNotNull(IgniteVersionUtils.COPYRIGHT);

assertTrue(COPYRIGHT.equals(IgniteVersionUtils.COPYRIGHT));
}
}
Expand Up @@ -20,6 +20,7 @@
import java.util.Set;
import junit.framework.JUnit4TestAdapter;
import junit.framework.TestSuite;
import org.apache.ignite.internal.IgniteVersionUtilsSelfTest;
import org.apache.ignite.internal.commandline.CommandHandlerParsingTest;
import org.apache.ignite.internal.pagemem.impl.PageIdUtilsSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheUtilsSelfTest;
Expand Down Expand Up @@ -85,6 +86,7 @@ public static TestSuite suite() {
public static TestSuite suite(Set<Class> ignoredTests) {
TestSuite suite = new TestSuite("Ignite Util Test Suite");

suite.addTest(new JUnit4TestAdapter(IgniteVersionUtilsSelfTest.class));
suite.addTest(new JUnit4TestAdapter(GridThreadPoolExecutorServiceSelfTest.class));
suite.addTest(new JUnit4TestAdapter(IgniteThreadPoolSizeTest.class));
GridTestUtils.addTestIfNeeded(suite, IgniteUtilsSelfTest.class, ignoredTests);
Expand Down

0 comments on commit ad665d3

Please sign in to comment.