Skip to content

Commit

Permalink
[maven-release-plugin] prepare release CalendarPortlet-2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
loulou2u committed Jan 19, 2023
1 parent 16fe996 commit bcb8f55
Showing 1 changed file with 30 additions and 36 deletions.
66 changes: 30 additions & 36 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">

<parent>
<groupId>org.jasig.parent</groupId>
Expand All @@ -35,14 +34,14 @@

<name>Calendar Portlet</name>
<description>Calendar Portlet.</description>
<version>2.6.3-SNAPSHOT</version>
<version>2.7.0</version>
<url>${jasig-site-base}/CalendarPortlet/${project.version}</url>

<scm>
<connection>scm:git:git://github.com/Jasig/CalendarPortlet.git</connection>
<developerConnection>scm:git:[email protected]:Jasig/CalendarPortlet.git</developerConnection>
<url>https://github.com/Jasig/CalendarPortlet</url>
<tag>HEAD</tag>
<tag>CalendarPortlet-2.7.0</tag>
</scm>

<issueManagement>
Expand Down Expand Up @@ -1084,8 +1083,8 @@
</goals>
<configuration>
<tasks>
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath" />
<property name="plugin_classpath" refid="maven.plugin.classpath" />

<!--
| The following specifies failonerror=false because it will produce an exception like...
Expand All @@ -1101,12 +1100,11 @@
+-->

<java failonerror="false" classname="org.jasig.portlet.calendar.util.SchemaCreator">
<sysproperty key="logback.configurationFile" value="command-line.logback.xml"/>
<sysproperty key="logback.configurationFile" value="command-line.logback.xml" />
<classpath>
<pathelement
location="${project.build.directory}/${project.artifactId}/WEB-INF/context"/>
<pathelement path="${runtime_classpath}"/>
<pathelement path="${plugin_classpath}"/>
<pathelement location="${project.build.directory}/${project.artifactId}/WEB-INF/context" />
<pathelement path="${runtime_classpath}" />
<pathelement path="${plugin_classpath}" />
</classpath>
</java>
</tasks>
Expand Down Expand Up @@ -1139,27 +1137,25 @@
<configuration>
<tasks>
<!-- Set default value of data location if it is not set -->
<property name="dir" value="${basedir}/src/main/data"/>
<property name="dir" value="${basedir}/src/main/data" />

<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath" />
<property name="plugin_classpath" refid="maven.plugin.classpath" />
<!-- Provided jars don't seem to be added to the runtime
classpath, so we manually add in servlet.jar here -->
<property name="servlet.jar"
value="${maven.dependency.javax.servlet.servlet-api.jar.path}"/>
<property name="servlet.jar" value="${maven.dependency.javax.servlet.servlet-api.jar.path}" />

<java failonerror="true" classname="org.danann.cernunnos.runtime.Main">
<sysproperty key="logback.configurationFile" value="command-line.logback.xml"/>
<sysproperty key="logback.configurationFile" value="command-line.logback.xml" />
<classpath>
<pathelement path="${runtime_classpath}"/>
<pathelement path="${plugin_classpath}"/>
<pathelement location="${servlet.jar}"/>
<pathelement
path="${project.build.directory}/${project.artifactId}/WEB-INF/classes"/>
<pathelement path="${runtime_classpath}" />
<pathelement path="${plugin_classpath}" />
<pathelement location="${servlet.jar}" />
<pathelement path="${project.build.directory}/${project.artifactId}/WEB-INF/classes" />
</classpath>

<arg value="classpath://org/jasig/portlet/calendar/io/import.crn.xml"/>
<arg value="${dir}"/>
<arg value="classpath://org/jasig/portlet/calendar/io/import.crn.xml" />
<arg value="${dir}" />
</java>
</tasks>
</configuration>
Expand All @@ -1177,24 +1173,22 @@
You must set the "dir" parameter. (-Ddir={something})
</fail>

<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath" />
<property name="plugin_classpath" refid="maven.plugin.classpath" />
<!-- Provided jars don't seem to be added to the runtime
classpath, so we manually add in servlet.jar here -->
<property name="servlet.jar"
value="${maven.dependency.javax.servlet.servlet-api.jar.path}"/>
<property name="servlet.jar" value="${maven.dependency.javax.servlet.servlet-api.jar.path}" />

<java failonerror="true" fork="true" classname="org.danann.cernunnos.runtime.Main">
<sysproperty key="logback.configurationFile" value="command-line.logback.xml"/>
<sysproperty key="logback.configurationFile" value="command-line.logback.xml" />
<classpath>
<pathelement path="${runtime_classpath}"/>
<pathelement path="${plugin_classpath}"/>
<pathelement location="${servlet.jar}"/>
<pathelement
path="${project.build.directory}/${project.artifactId}/WEB-INF/classes"/>
<pathelement path="${runtime_classpath}" />
<pathelement path="${plugin_classpath}" />
<pathelement location="${servlet.jar}" />
<pathelement path="${project.build.directory}/${project.artifactId}/WEB-INF/classes" />
</classpath>
<arg value="classpath://org/jasig/portlet/calendar/io/export.crn.xml"/>
<arg value="${dir}"/>
<arg value="classpath://org/jasig/portlet/calendar/io/export.crn.xml" />
<arg value="${dir}" />
</java>
</tasks>
</configuration>
Expand Down

0 comments on commit bcb8f55

Please sign in to comment.