Skip to content

Commit 34746e7

Browse files
akomakomakomakom
committed
phase 1 move to parent and license
1 parent 149f84d commit 34746e7

File tree

6 files changed

+80
-94
lines changed

6 files changed

+80
-94
lines changed

‎azure-pipelines.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
#
2-
# Copyright Terracotta, Inc.
32
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
3+
# The contents of this file are subject to the Terracotta Public License Version
4+
# 2.0 (the "License"); You may not use this file except in compliance with the
5+
# License. You may obtain a copy of the License at
76
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
7+
# http://terracotta.org/legal/terracotta-public-license.
98
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
9+
# Software distributed under the License is distributed on an "AS IS" basis,
10+
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
11+
# the specific language governing rights and limitations under the License.
12+
#
13+
# The Covered Software is Terracotta Core.
14+
#
15+
# The Initial Developer of the Covered Software is
16+
# Terracotta, Inc., a Software AG company
17+
#
18+
1519
#
1620

1721
# See shared code location for steps and parameters:

‎checkstyle-toolkit/suppressions.xml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<!--
4-
~
5-
~ The contents of this file are subject to the Terracotta Public License Version
6-
~ 2.0 (the "License"); You may not use this file except in compliance with the
7-
~ License. You may obtain a copy of the License at
8-
~
9-
~ http://terracotta.org/legal/terracotta-public-license.
10-
~
11-
~ Software distributed under the License is distributed on an "AS IS" basis,
12-
~ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
13-
~ the specific language governing rights and limitations under the License.
14-
~
15-
~ The Covered Software is Terracotta Core.
16-
~
17-
~ The Initial Developer of the Covered Software is
18-
~ Terracotta, Inc., a Software AG company
19-
~
4+
5+
The contents of this file are subject to the Terracotta Public License Version
6+
2.0 (the "License"); You may not use this file except in compliance with the
7+
License. You may obtain a copy of the License at
8+
9+
http://terracotta.org/legal/terracotta-public-license.
10+
11+
Software distributed under the License is distributed on an "AS IS" basis,
12+
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
13+
the specific language governing rights and limitations under the License.
14+
15+
The Covered Software is Terracotta Core.
16+
17+
The Initial Developer of the Covered Software is
18+
Terracotta, Inc., a Software AG company
2019
-->
2120

2221
<!DOCTYPE suppressions PUBLIC

‎pom.xml

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.terracotta</groupId>
2727
<artifactId>terracotta-parent</artifactId>
28-
<version>5.10</version>
28+
<version>5.12-SNAPSHOT</version>
2929
<relativePath/>
3030
</parent>
3131

@@ -69,64 +69,8 @@
6969
</modules>
7070

7171
<build>
72-
<pluginManagement>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.sonatype.plugins</groupId>
76-
<artifactId>nexus-staging-maven-plugin</artifactId>
77-
<version>1.6.1</version>
78-
<extensions>true</extensions>
79-
<configuration>
80-
<!-- The Base URL of Nexus instance where we want to stage -->
81-
<nexusUrl>http://nexus.terracotta.eur.ad.sag</nexusUrl>
82-
<!-- The server "id" element from settings to use authentication from -->
83-
<serverId>terracotta-nexus-staging</serverId>
84-
<skipNexusStagingDeployMojo>${skip.deploy}</skipNexusStagingDeployMojo>
85-
</configuration>
86-
</plugin>
87-
<plugin>
88-
<inherited>false</inherited>
89-
<groupId>com.mycila</groupId>
90-
<artifactId>license-maven-plugin</artifactId>
91-
<version>3.0.rc1</version>
92-
<configuration>
93-
<keywords>
94-
<keyword>License</keyword>
95-
</keywords>
96-
<aggregate>true</aggregate>
97-
<header>header.txt</header>
98-
<mapping>
99-
<java>SLASHSTAR_STYLE</java>
100-
</mapping>
101-
<excludes>
102-
<exclude>**/README</exclude>
103-
<exclude>**/LICENSE</exclude>
104-
<exclude>src/test/resources/**</exclude>
105-
<exclude>src/main/resources/**</exclude>
106-
<!-- if you only import management in your ide, it will generate its metadata under management/ -->
107-
<exclude>**/.idea/**</exclude>
108-
<exclude>**/*.html</exclude>
109-
<exclude>**/*.txt</exclude>
110-
<exclude>**/*.yml</exclude>
111-
<exclude>**/*.properties</exclude>
112-
<exclude>**/*.xsd</exclude>
113-
<exclude>**/*.sh</exclude>
114-
<exclude>**/*.bat</exclude>
115-
<exclude>**/nbproject/**</exclude>
116-
<exclude>**/*.adoc</exclude>
117-
<exclude>**/*.xml</exclude>
118-
<exclude>mvnw</exclude>
119-
<exclude>mvnw.cmd</exclude>
120-
</excludes>
121-
</configuration>
122-
</plugin>
123-
</plugins>
124-
</pluginManagement>
72+
12573
<plugins>
126-
<plugin>
127-
<groupId>org.sonatype.plugins</groupId>
128-
<artifactId>nexus-staging-maven-plugin</artifactId>
129-
</plugin>
13074
<plugin>
13175
<groupId>org.apache.maven.plugins</groupId>
13276
<artifactId>maven-compiler-plugin</artifactId>

‎terracotta-kit/src/assemble/init/sysv/terracotta.properties

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
# Intended to be placed into /etc/default/terracotta
33
# or /etc/default/X if using multiple copies (name should match the name of the init script)
44

5+
#
6+
# The contents of this file are subject to the Terracotta Public License Version
7+
# 2.0 (the "License"); You may not use this file except in compliance with the
8+
# License. You may obtain a copy of the License at
9+
#
10+
# http://terracotta.org/legal/terracotta-public-license.
11+
#
12+
# Software distributed under the License is distributed on an "AS IS" basis,
13+
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
14+
# the specific language governing rights and limitations under the License.
15+
#
16+
# The Covered Software is Terracotta Core.
17+
#
18+
# The Initial Developer of the Covered Software is
19+
# Terracotta, Inc., a Software AG company
20+
21+
522
# Define some variables
623
# Name of this terracotta instance, passed to start-tc-server.sh (-n argument below)
724
NAME=terracotta

‎terracotta-kit/src/assemble/init/sysv/terracotta.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,26 @@
1111
# Short-Description: Terracotta Server
1212
### END INIT INFO
1313

14+
# The contents of this file are subject to the Terracotta Public License Version
15+
# 2.0 (the "License"); You may not use this file except in compliance with the
16+
# License. You may obtain a copy of the License at
17+
#
18+
# http://terracotta.org/legal/terracotta-public-license.
19+
#
20+
# Software distributed under the License is distributed on an "AS IS" basis,
21+
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
22+
# the specific language governing rights and limitations under the License.
23+
#
24+
# The Covered Software is Terracotta Core.
25+
#
26+
# The Initial Developer of the Covered Software is
27+
# Terracotta, Inc., a Software AG company
28+
29+
30+
31+
32+
33+
1434
# Allow multiple copies of this script with own config, ie
1535
# /etc/init/terracotta1, /etc/init.d/terracotta2
1636
APP=$(basename $0)

‎terracotta-kit/src/assemble/server/bin/start-tc-server.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
#!/bin/sh
22

3-
#
3+
44
# The contents of this file are subject to the Terracotta Public License Version
55
# 2.0 (the "License"); You may not use this file except in compliance with the
6-
# License. You may obtain a copy of the License at
7-
#
8-
# http://terracotta.org/legal/terracotta-public-license.
9-
#
6+
# License. You may obtain a copy of the License at
7+
#
8+
# http://terracotta.org/legal/terracotta-public-license.
9+
#
1010
# Software distributed under the License is distributed on an "AS IS" basis,
1111
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
1212
# the specific language governing rights and limitations under the License.
13-
#
14-
# The Covered Software is Terracotta Platform.
15-
#
16-
# The Initial Developer of the Covered Software is
17-
# Terracotta, Inc., a Software AG company
1813
#
14+
# The Covered Software is Terracotta Core.
15+
#
16+
# The Initial Developer of the Covered Software is
17+
# Terracotta, Inc., a Software AG company
18+
19+
20+
1921

2022
TC_SERVER_DIR=$(dirname "$(cd "$(dirname "$0")";pwd)")
2123

0 commit comments

Comments
 (0)