You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/03/19 22:02:14 UTC

[1/3] git commit: [flex-flexunit] [refs/heads/release4.2.0] - fill in missing information

Repository: flex-flexunit
Updated Branches:
  refs/heads/release4.2.0 23bd0300b -> 03198dcb0


fill in missing information


Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/e8c2ed9b
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/e8c2ed9b
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/e8c2ed9b

Branch: refs/heads/release4.2.0
Commit: e8c2ed9b7e9fc66d49f0063dadc96da9e30ada6e
Parents: 23bd030
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 08:00:00 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 08:00:00 2014 +1100

----------------------------------------------------------------------
 LICENSE.bin | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e8c2ed9b/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 7bb6710..20185f6 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -136,7 +136,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  The MIT License (MIT)
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2007-2011, Digital Primates IT Consulting Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -162,7 +162,7 @@ THE SOFTWARE.
  
  The MIT License (MIT)
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2007-2011, Digital Primates IT Consulting Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -433,8 +433,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 FlexUnit4/libs/hamcrest-as3-flex-1.1.3.swc
 FlexUnit4Test/libs/hamcrest-as3-flex-1.1.3.swc
 
-Copyright (c) 2009 the original author or authors
-All rights reserved.
+Copyright (c) 2000-2006, www.hamcrest.org. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:


[3/3] git commit: [flex-flexunit] [refs/heads/release4.2.0] - Currently a few issue with java docs and only a nice to have so comment out for now Add javadocs and NOTICE files to rat exclusions

Posted by jm...@apache.org.
Currently a few issue with java docs and only a nice to have so comment out for now
Add javadocs and NOTICE files to rat exclusions


Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/03198dcb
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/03198dcb
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/03198dcb

Branch: refs/heads/release4.2.0
Commit: 03198dcb05176faef0f5e9b9cac5f42ba7eebd0b
Parents: 790f052
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 08:02:02 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 08:02:02 2014 +1100

----------------------------------------------------------------------
 build.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/03198dcb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 319b70c..350447c 100644
--- a/build.xml
+++ b/build.xml
@@ -204,13 +204,15 @@ to contribute to our CI process.
          <zipfileset dir="${flexcoverlistener.loc}" excludes="**/target/**,**/libs/**,**/in/*" prefix="FlexUnit4FlexCoverListener" />
          	
          <!-- Docs -->
-         <zipfileset dir="${anttasks.loc}/target/docs" prefix="${anttasks.loc}/target/docs" />
-         <zipfileset dir="${core.loc}/target/docs" prefix="${core.loc}/target/docs" />
-		 <zipfileset dir="${fluint.loc}/target/docs" prefix="${fluint.loc}/target/docs" />
-         <zipfileset dir="${cilistener.loc}/target/docs" prefix="${cilistener.loc}/target/doc" />
-         <zipfileset dir="${uilistener.loc}/target/docs" prefix="${uilistener.loc}/target/docs" />
-         <zipfileset dir="${aircilistener.loc}/target/docs" prefix="${aircilistener.loc}/target/docs" />
-         <zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="${flexcoverlistener.loc}/target/docs" />
+         <zipfileset dir="${core.loc}/target/docs" prefix="FlexUnit4/target/docs" />
+      	 <!--
+         <zipfileset dir="${anttasks.loc}/target/docs" prefix="FlexUnit4AntTasks/target/docs" />
+		 <zipfileset dir="${fluint.loc}/target/docs" prefix="FlexUnit4FluintExtensions/target/docs" />
+         <zipfileset dir="${cilistener.loc}/target/docs" prefix="FlexUnit4CIListener/target/doc" />
+         <zipfileset dir="${uilistener.loc}/target/docs" prefix="FlexUnit4UIListener/target/docs" />
+         <zipfileset dir="${aircilistener.loc}/target/docs" prefix="FlexUnit4AirCIListener/target/docs" />
+         <zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="FlexUnit4FlexCoverListener}/target/docs" />
+         -->
       </zip>
    </target>
 
@@ -231,13 +233,15 @@ to contribute to our CI process.
      	 <zipfileset dir="${basedir}" includes="LICENSE.bin,NOTICE.bin,README,RELEASE_NOTES" />
       	
          <!-- Docs -->
+      	 <zipfileset dir="${core.loc}/target/docs" prefix="docs/flexunit" />
+      	 <!--
          <zipfileset dir="${anttasks.loc}/target/docs" prefix="docs/anttasks" />
-         <zipfileset dir="${core.loc}/target/docs" prefix="docs/flexunit" />
 		 <zipfileset dir="${fluint.loc}/target/docs" prefix="docs/flexUnit4FluintExtensions" />
          <zipfileset dir="${cilistener.loc}/target/docs" prefix="docs/cilistener" />
          <zipfileset dir="${uilistener.loc}/target/docs" prefix="docs/uilistener" />
          <zipfileset dir="${aircilistener.loc}/target/docs" prefix="docs/aircilistener" />
          <zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="docs/flexcoverlistener" />
+         -->
 
          <!-- Artifacts -->
          <zipfileset dir="${anttasks.loc}/target" prefix="flexunit">
@@ -404,8 +408,11 @@ to contribute to our CI process.
                 <exclude name="**/.settings/**"/>
                 <exclude name="**/.idea/**"/>
                 <exclude name="**/*.iml"/>
-				<!-- -->
-                <exclude name="**/LICENSE*"/>
+				<!-- NOTICE and LICENSE files -->
+            	<exclude name="**/*LICENSE*"/>
+            	<exclude name="**/*NOTICE*"/>
+            	<!-- Java docs and AS docs -->
+            	<exclude name="**/target/docs/**"/>
                 <!--          End of source files           -->
                 <!--          Start of binary files           -->
                 <!-- exclude media (png, ico) -->


[2/3] git commit: [flex-flexunit] [refs/heads/release4.2.0] - add missing copyright

Posted by jm...@apache.org.
add missing copyright


Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/790f0528
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/790f0528
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/790f0528

Branch: refs/heads/release4.2.0
Commit: 790f0528cb75cd080f234d7c01d43c0187246ece
Parents: e8c2ed9
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 08:00:35 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 08:00:35 2014 +1100

----------------------------------------------------------------------
 NOTICE.bin | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/790f0528/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index 37f40f3..48801a1 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -4,6 +4,9 @@ Copyright 2014 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+FlexUnit4AntTasks/lib/jaxen-1.1-beta-6.jar
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
 FlexUnit4AntTasks/lib/dom4j-1.6.1.jar
 Copyright 2001-2005 (c) MetaStuff, Ltd. All Rights Reserved.
 
@@ -35,5 +38,3 @@ Copyright (c) 2010, Drew Bourne.
 
 FlexUnit4Test/libs/builds/saxon9he.jar
 Copyright (c) 2004-2010, Saxonica Limited. All rights reserved.
-
-