Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reformat and copyright header. no code changes. #10

Merged
merged 3 commits into from
Oct 23, 2017
Merged

reformat and copyright header. no code changes. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f16a3f
reformat and copyright header. no code changes.
imario42 Oct 23, 2017
a387d5c
Merge branch 'master' of https://github.com/dlemmermann/CalendarFX in…
imario42 Oct 23, 2017
e890064
Merge branch 'master' into master
imario42 Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
106 changes: 61 additions & 45 deletions CalendarFXApp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
18 changes: 14 additions & 4 deletions CalendarFXApp/src/main/java/com/calendarfx/app/CalendarAppLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading