Author: taylor
Date: Wed May 4 17:05:56 2016
New Revision: 1742302
URL: http://svn.apache.org/viewvc?rev=1742302&view=rev
Log:
JS2-1355: cleaning up Rat licensing issues
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/NumericVersionTest.java
portals/jetspeed-2/portal/trunk/docs/release/RELEASE-PROCEDURE.txt
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.properties
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.xml
portals/jetspeed-2/portal/trunk/post-release.sh
portals/jetspeed-2/portal/trunk/pre-release.sh
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
Wed May 4 17:05:56 2016
@@ -1,5 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+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.
+-->
<page id="delegated.psml" hidden="false">
<title>Engineering Users</title>
<short-title>Engineering</short-title>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/NumericVersionTest.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/NumericVersionTest.java?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/NumericVersionTest.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/NumericVersionTest.java
Wed May 4 17:05:56 2016
@@ -1,3 +1,19 @@
+/*
+ * 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.jetspeed.tools.pamanager;
import junit.framework.TestCase;
Modified: portals/jetspeed-2/portal/trunk/docs/release/RELEASE-PROCEDURE.txt
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/docs/release/RELEASE-PROCEDURE.txt?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/docs/release/RELEASE-PROCEDURE.txt
(original)
+++ portals/jetspeed-2/portal/trunk/docs/release/RELEASE-PROCEDURE.txt Wed May
4 17:05:56 2016
@@ -1,3 +1,18 @@
+# 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.
+
==========================================
Environment setup for releasing artifacts
==========================================
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.properties?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.properties
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.properties
Wed May 4 17:05:56 2016
@@ -1,3 +1,18 @@
+# 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.
+
# general properties
portal.name = jetexpress
pa.name = jetexpress-pa
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.xml?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/build.xml
Wed May 4 17:05:56 2016
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+
+ $Id:$
+ -->
<project name="jetexpress" default="delta" basedir=".">
Modified: portals/jetspeed-2/portal/trunk/post-release.sh
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/post-release.sh?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/post-release.sh (original)
+++ portals/jetspeed-2/portal/trunk/post-release.sh Wed May 4 17:05:56 2016
@@ -1,4 +1,18 @@
#!/usr/bin/env bash
+# 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.
sed -i.bak s/2.3.1/2.3.2-SNAPSHOT/g
applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
sed -i.bak s/2.3.1/2.3.2-SNAPSHOT/g enterprise/ear-full/pom.xml
sed -i.bak s/2.3.1/2.3.2-SNAPSHOT/g enterprise/ear-min/pom.xml
Modified: portals/jetspeed-2/portal/trunk/pre-release.sh
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pre-release.sh?rev=1742302&r1=1742301&r2=1742302&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pre-release.sh (original)
+++ portals/jetspeed-2/portal/trunk/pre-release.sh Wed May 4 17:05:56 2016
@@ -1,4 +1,18 @@
#!/usr/bin/env bash
+# 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.
sed -i.bak s/2.3.1-SNAPSHOT/2.3.1/g
applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
sed -i.bak s/2.3.1-SNAPSHOT/2.3.1/g enterprise/ear-full/pom.xml
sed -i.bak s/2.3.1-SNAPSHOT/2.3.1/g enterprise/ear-min/pom.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
