Can someone validate that Sling still builds correctly on Windows? There is a nasty bug in Maven's compiler support[1] which, IIRC, makes it impossible to compile package-info files. From the looks of it, this bug is still outstanding, although I haven't run into it in years.
Regards, Justin [1] http://jira.codehaus.org/browse/MCOMPILER-71 On Mon, Nov 7, 2011 at 6:25 AM, <[email protected]> wrote: > Author: fmeschbe > Date: Mon Nov 7 14:25:43 2011 > New Revision: 1198746 > > URL: http://svn.apache.org/viewvc?rev=1198746&view=rev > Log: > SLING-2267 Upgrade to Maven Bundle plugin 2.3.4 and make use of BND package > level annotations for package exports > > Added: > > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java > (with props) > > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java > (with props) > > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java > (with props) > Modified: > sling/trunk/bundles/auth/core/pom.xml > > Modified: sling/trunk/bundles/auth/core/pom.xml > URL: > http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=1198746&r1=1198745&r2=1198746&view=diff > ============================================================================== > --- sling/trunk/bundles/auth/core/pom.xml (original) > +++ sling/trunk/bundles/auth/core/pom.xml Mon Nov 7 14:25:43 2011 > @@ -60,19 +60,15 @@ > <plugin> > <groupId>org.apache.felix</groupId> > <artifactId>maven-bundle-plugin</artifactId> > + <version>2.3.4</version> > <extensions>true</extensions> > <configuration> > <instructions> > <Bundle-DocURL> > http://sling.apache.org/site/authentication.html > </Bundle-DocURL> > - <Export-Package> > - org.apache.sling.auth.core;version=1.0.0, > - org.apache.sling.auth.core.spi;version=1.0.4, > - org.apache.sling.engine.auth;version=2.0.6 > - </Export-Package> > <Import-Package> > - > org.apache.sling.api.auth;version="[$(version;==;$(@)),$(version;=+;$(@)))", > + org.apache.sling.api.auth;provide:=true, > * > </Import-Package> > <Private-Package> > @@ -144,6 +140,11 @@ > <groupId>org.apache.felix</groupId> > <artifactId>org.apache.felix.scr.annotations</artifactId> > </dependency> > + <dependency> > + <groupId>biz.aqute</groupId> > + <artifactId>bndlib</artifactId> > + <version>1.43.0</version> > + </dependency> > > <!-- Test Dependencies --> > <dependency> > > Added: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java > URL: > http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java?rev=1198746&view=auto > ============================================================================== > --- > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java > (added) > +++ > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java > Mon Nov 7 14:25:43 2011 > @@ -0,0 +1,33 @@ > +/* > + * 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. > + */ > + > +/** > + * Provides the authentication helper service as well as a number > + * of utility functions in the {@link org.apache.sling.auth.core.Util} > + * class. > + * > + * @version 1.1 > + */ > +@Version("1.1") > +@Export(optional = "provide:=true") > +package org.apache.sling.auth.core; > + > +import aQute.bnd.annotation.Export; > +import aQute.bnd.annotation.Version; > + > > Propchange: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/package-info.java > ------------------------------------------------------------------------------ > svn:executable = * > > Added: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java > URL: > http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java?rev=1198746&view=auto > ============================================================================== > --- > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java > (added) > +++ > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java > Mon Nov 7 14:25:43 2011 > @@ -0,0 +1,35 @@ > +/* > + * 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. > + */ > + > +/** > + * Provides API to be implemented by provides of authentication > + * mechanisms. The most important interface (and service definition) is > + * the {@link org.apache.sling.auth.core.spi.AuthenticationHandler} > + * interface with the > + * {@link org.apache.sling.auth.core.spi.AbstractAuthenticationHandler} > + * being an abstract base implementation from which concrete > + * implementations may inherit. > + * > + * @version 1.0.4 > + */ > +@Version("1.0.4") > +package org.apache.sling.auth.core.spi; > + > +import aQute.bnd.annotation.Version; > + > > Propchange: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/spi/package-info.java > ------------------------------------------------------------------------------ > svn:executable = * > > Added: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java > URL: > http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java?rev=1198746&view=auto > ============================================================================== > --- > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java > (added) > +++ > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java > Mon Nov 7 14:25:43 2011 > @@ -0,0 +1,35 @@ > +/* > + * 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. > + */ > + > +/** > + * Provides the original authentication handler service API initially > + * bundled with the Sling Engine bundle. > + * <p> > + * The API in this package is still supported but marked deprecated and > + * not further evolving. Please change your implementations to implement > + * the new {@link org.apache.sling.auth.core.spi.AuthenticationHandler} > + * interface. > + * > + * @version 2.0.6 > + */ > +@Version("2.0.6") > +package org.apache.sling.engine.auth; > + > +import aQute.bnd.annotation.Version; > + > > Propchange: > sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/engine/auth/package-info.java > ------------------------------------------------------------------------------ > svn:executable = * > > >
