Skip to content

Commit

Permalink
reformat and copyright header. no code changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
imario42 committed Oct 23, 2017
1 parent c8821c2 commit 3f16a3f
Show file tree
Hide file tree
Showing 369 changed files with 26,641 additions and 23,053 deletions.
106 changes: 61 additions & 45 deletions CalendarFXApp/pom.xml
@@ -1,52 +1,68 @@
<!--
~ Copyright (C) 2017 Dirk Lemmermann Software & Consulting (dlsc.com)
~
~ Licensed 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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>application</artifactId>
<name>CalendarFXApp</name>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>application</artifactId>
<name>CalendarFXApp</name>

<parent>
<groupId>com.calendarfx</groupId>
<artifactId>calendar</artifactId>
<version>8.4.1</version>
</parent>
<parent>
<groupId>com.calendarfx</groupId>
<artifactId>calendar</artifactId>
<version>8.4.1</version>
</parent>

<dependencies>
<dependencies>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>view</artifactId>
<version>8.4.1</version>
</dependency>
<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>view</artifactId>
<version>8.4.1</version>
</dependency>

</dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<finalName>calendar-demo</finalName>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>com.calendarfx.app.CalendarAppLauncher</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-samples</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<finalName>calendar-demo</finalName>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>com.calendarfx.app.CalendarAppLauncher</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-samples</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
18 changes: 14 additions & 4 deletions CalendarFXApp/src/main/java/com/calendarfx/app/CalendarApp.java
@@ -1,7 +1,17 @@
/**
* Copyright (C) 2015, 2016 Dirk Lemmermann Software & Consulting (dlsc.com)
*
* This file is part of CalendarFX.
/*
* Copyright (C) 2017 Dirk Lemmermann Software & Consulting (dlsc.com)
*
* Licensed 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 com.calendarfx.app;
Expand Down
@@ -1,7 +1,17 @@
/**
* Copyright (C) 2015, 2016 Dirk Lemmermann Software & Consulting (dlsc.com)
*
* This file is part of CalendarFX.
/*
* Copyright (C) 2017 Dirk Lemmermann Software & Consulting (dlsc.com)
*
* Licensed 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 com.calendarfx.app;
Expand Down
138 changes: 77 additions & 61 deletions CalendarFXAssembly/pom.xml
@@ -1,63 +1,79 @@
<!--
~ Copyright (C) 2017 Dirk Lemmermann Software & Consulting (dlsc.com)
~
~ Licensed 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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.calendarfx</groupId>
<artifactId>calendar</artifactId>
<version>8.4.1</version>
</parent>
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
<name>CalendarFXAssembly</name>
<description>A module for the sole purpose of creating assemblies.</description>

<dependencies>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>view</artifactId>
<version>8.4.1</version>
</dependency>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>recurrence</artifactId>
<version>8.4.1</version>
</dependency>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>google</artifactId>
<version>8.4.1</version>
</dependency>

</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<descriptors>
<descriptor>${project.basedir}/src/assembly/bin.xml</descriptor>
<descriptor>${project.basedir}/src/assembly/src.xml</descriptor>
</descriptors>
<finalName>calendarfx-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>make-distribution-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.calendarfx</groupId>
<artifactId>calendar</artifactId>
<version>8.4.1</version>
</parent>
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
<name>CalendarFXAssembly</name>
<description>A module for the sole purpose of creating assemblies.</description>

<dependencies>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>view</artifactId>
<version>8.4.1</version>
</dependency>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>recurrence</artifactId>
<version>8.4.1</version>
</dependency>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>google</artifactId>
<version>8.4.1</version>
</dependency>

</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<descriptors>
<descriptor>${project.basedir}/src/assembly/bin.xml</descriptor>
<descriptor>${project.basedir}/src/assembly/src.xml</descriptor>
</descriptors>
<finalName>calendarfx-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>make-distribution-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>

0 comments on commit 3f16a3f

Please sign in to comment.